diff --git a/AmpPlotter/AmpPlotter/PlotterMainWindow.cc b/AmpPlotter/AmpPlotter/PlotterMainWindow.cc
index d0f84682..483ad032 100644
--- a/AmpPlotter/AmpPlotter/PlotterMainWindow.cc
+++ b/AmpPlotter/AmpPlotter/PlotterMainWindow.cc
@@ -253,7 +253,7 @@ m_generator( factory.generator() )
   m_canvFrame->AddFrame( m_canvButton, &canvLayoutHints );
   
   // create a button to clear the canvas...
-  m_clearCanvButton = new TGTextButton( m_canvFrame, "&Clear Canvas", kclearCanv );
+  m_clearCanvButton = new TGTextButton( m_canvFrame, "&Clear Canvas", kClearCanv );
   m_clearCanvButton->Associate( this );
   m_clearCanvButton->Resize( kWidth/3, 20 );
   m_canvFrame->AddFrame( m_clearCanvButton, &canvLayoutHints );
@@ -467,7 +467,7 @@ PlotterMainWindow::ProcessMessage( long mes, long p1, long p2 )
               }
               break;
               
-            case kclearCanv:
+            case kClearCanv:
               m_factory.clearCanvas();
               break;
               
diff --git a/AmpPlotter/AmpPlotter/PlotterMainWindow.h b/AmpPlotter/AmpPlotter/PlotterMainWindow.h
index db667449..ec4ba136 100644
--- a/AmpPlotter/AmpPlotter/PlotterMainWindow.h
+++ b/AmpPlotter/AmpPlotter/PlotterMainWindow.h
@@ -57,21 +57,23 @@ class PlotterMainWindow : public TGMainFrame
 		
  public:
 	
-  enum { kWidth  = 690 };
-  enum { kHeight = 500 };
+  enum { 
+       kWidth  = 690,
+       kHeight = 500,
 	
-  enum { kIndexMask     = 0x000000FF };
-  enum { kButtonMask    = 0xFFFFFF00 };
+       kIndexMask     = 0x000000FF,
+       kButtonMask    = 0xFFFFFF00,
 
-  enum { kReaction      = 0x000100 };
-  enum { kType          = 0x000200 };
-  enum { kDrawOption    = 0x000400 };
+       kReaction      = 0x000100,
+       kType          = 0x000200,
+       kDrawOption    = 0x000400,
 	
-  enum { kExit, kPlot, kSelectAllAmp, kClearAmp, kSelectAllSum, kClearSum,
-         kChoosePlot, kChoosePad , kclearCanv, kChooseCanv};
-  enum { kData, kBkgnd, kAccMC, kGenMC };
-  enum { kSumSelect, kAmpSelect };  
-  enum { kWeightMC };
+       kExit = 0, kPlot, kSelectAllAmp, kClearAmp, kSelectAllSum, kClearSum,
+         kChoosePlot, kChoosePad , kClearCanv, kChooseCanv,
+       kData=0, kBkgnd, kAccMC, kGenMC,
+       kSumSelect=0, kAmpSelect, 
+       kWeightMC=0 
+  };
   
   PlotterMainWindow( const TGWindow*, PlotFactory& );
 	
diff --git a/AmpTools/IUAmpTools/AmpToolsInterface.cc b/AmpTools/IUAmpTools/AmpToolsInterface.cc
index 4ae72a43..93b32e55 100644
--- a/AmpTools/IUAmpTools/AmpToolsInterface.cc
+++ b/AmpTools/IUAmpTools/AmpToolsInterface.cc
@@ -906,7 +906,7 @@ AmpToolsInterface::forceUserVarRecalculation( bool state ){
 float
 AmpToolsInterface::random( float randMax ) const {
   
-  return ( (float) rand() / RAND_MAX ) * randMax;
+  return ( (float) rand() / (float) RAND_MAX ) * randMax;
 }
 
 void
diff --git a/AmpTools/IUAmpToolsMPI/DataReaderMPI.h b/AmpTools/IUAmpToolsMPI/DataReaderMPI.h
index c188668f..a98b88e5 100644
--- a/AmpTools/IUAmpToolsMPI/DataReaderMPI.h
+++ b/AmpTools/IUAmpToolsMPI/DataReaderMPI.h
@@ -379,7 +379,7 @@ template< class T >
 void DataReaderMPI<T>::defineMPIType()
 {
   
-  KinStruct kinStruct;
+  KinStruct kinStruct = {0};
   
   // arrays used to define info about the six elements in the struct
   int length[6];
diff --git a/AmpTools/UpRootMinuit/URMinuit.cc b/AmpTools/UpRootMinuit/URMinuit.cc
index 37243b19..56bfeeb8 100644
--- a/AmpTools/UpRootMinuit/URMinuit.cc
+++ b/AmpTools/UpRootMinuit/URMinuit.cc
@@ -6131,11 +6131,19 @@ void URMinuit::mnplot(Double_urt *xpt, Double_urt *ypt, char* chpt, Int_urt nxyp
      overpr = kurFALSE;
      for (i = 1; i <= ny; ++i) {
  	for (ibk = 1; ibk <= nx; ++ibk) { cline[ibk-1] = ' '; }
+ //*-*-        gcc can't prove nx/nxbest stay within cline's bounds across the gotos below
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
  	cline[nx] = '\0';
  	cline[nx+1] = '\0';
  	cline[0]        = '.';
  	cline[nx-1]     = '.';
  	cline[nxbest-1] = '.';
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
  	if (i != 1 && i != nybest && i != ny) goto L320;
  	for (j = 1; j <= nx; ++j) { cline[j-1] = '.'; }
  L320: