diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.cpp b/uppsrc/ScatterCtrl/ScatterCtrl.cpp
index 401568baf..cbbc9fa9f 100644
--- a/uppsrc/ScatterCtrl/ScatterCtrl.cpp
+++ b/uppsrc/ScatterCtrl/ScatterCtrl.cpp
@@ -760,6 +760,7 @@ void ScatterCtrl::MouseMove(Point pt, dword keyFlags)
 	case LEFT_DOWN:		mouseAction = LEFT_MOVE;	break;
 	case MIDDLE_DOWN:	mouseAction = MIDDLE_MOVE;	break;
 	case RIGHT_DOWN:	mouseAction = RIGHT_MOVE;	break;
+	default: ; // avoids warning
 	}
 	WhenMouseClick(pt, keyFlags, mouseAction);
 }
diff --git a/uppsrc/ScatterDraw/DataSource.h b/uppsrc/ScatterDraw/DataSource.h
index d6679a6e3..54d483194 100644
--- a/uppsrc/ScatterDraw/DataSource.h
+++ b/uppsrc/ScatterDraw/DataSource.h
@@ -668,7 +668,7 @@ class TableData : public DataSourceSurf, public TableInterpolate {
 public:
 	typedef double (TableData::*Getdatafun)(int d);
 	
-	TableData() : areas(false), lendata(0), lenxAxis(0), lenyAxis(0) {};
+	TableData() : lendata(0), lenxAxis(0), lenyAxis(0), areas(false) {};
 
 	Interpolate Inter()				{return inter;}
 	void Inter(Interpolate inter)	{this->inter = inter;}
diff --git a/uppsrc/ScatterDraw/PieDraw.cpp b/uppsrc/ScatterDraw/PieDraw.cpp
index 13439fea2..0558dde01 100644
--- a/uppsrc/ScatterDraw/PieDraw.cpp
+++ b/uppsrc/ScatterDraw/PieDraw.cpp
@@ -10,19 +10,19 @@ static void DrawPie(Draw& w, double c_x, double c_y, double r, int start, int al
 	Point centre = Point(int(c_x), int(c_y));
 	vP << centre;
 	int ix;
-	int iy;	
+	int iy;
 	for (int i = 0; i <= n; i++) {
 		double x = c_x + r*cos((start+i*dalpha)*M_PI/1800);
-		ix = fround(x);		
+		ix = fround(x);
 		double y = c_y + r*sin((start+i*dalpha)*M_PI/1800);
 		iy = fround(y);
 		double dxy = (x-ix)*(x-ix) + (y-iy)*(y-iy);
-		if(dxy < 0.1 || i == 0 || i == n) 
+		if(dxy < 0.1 || i == 0 || i == n)
 			vP << Point(ix,iy);
-		if(w.IsGui()) 
-			w.DrawRect(ix, iy, 1, 1, Blend(fill, background, 150));			
+		if(w.Pixels())
+			w.DrawRect(ix, iy, 1, 1, Blend(fill, background, 150));
 	}
-	vP << centre;	
+	vP << centre;
 	w.DrawPolygon(vP, fill, width, outline, pattern, Null);
 }
 
diff --git a/uppsrc/ScatterDraw/ScatterDraw.h b/uppsrc/ScatterDraw/ScatterDraw.h
index 9a4322e44..81321a957 100644
--- a/uppsrc/ScatterDraw/ScatterDraw.h
+++ b/uppsrc/ScatterDraw/ScatterDraw.h
@@ -1662,7 +1662,8 @@ void ScatterDraw::Plot(T& w)
 						case ALIGN_LEFT:	ddx = 0;		break;
 						case ALIGN_CENTER:	ddx = -sz.cx/2;	break;
 						case ALIGN_RIGHT:	ddx = -sz.cx;	break;
-						}							
+						default: ; // to avoid warning
+						}
 						double x = points[i].x + dx + ddx;
 						double y = points[i].y + dy + ddy;
 						DrawText(w, x, y, 0, txt, fnt, series[j].labelsColor);