diff --git a/legend.c b/legend.c
index 66eb30488a..089be41454 100644
--- a/legend.c
+++ b/legend.c
@@ -30,7 +30,6 @@ int main(int argc, char *argv[])
   msSaveImage(NULL, img, argv[2]);
 
   msFreeImage(img);
-
   msFreeMap(map);
   
   return(MS_TRUE);
diff --git a/map.h b/map.h
index 9ec7b210fc..682b0754bd 100644
--- a/map.h
+++ b/map.h
@@ -792,7 +792,6 @@ typedef struct {
 int msSaveImage(mapObj *map, imageObj *img, char *filename);
 void msFreeImage(imageObj *img);
 
-
 // Function prototypes, not wrapable
 
 #ifndef SWIG
@@ -1036,19 +1035,15 @@ int msGMLWriteQuery(mapObj *map, char *filename); // mapgml.c
 /* ==================================================================== */
 /*      Prototypes for functions in mapdraw.c                           */
 /* ==================================================================== */
+void msClearPenValues(mapObj *map);
 imageObj *msDrawMap(mapObj *map);
-
 imageObj *msDrawQueryMap(mapObj *map);
-
 int msDrawLayer(mapObj *map, layerObj *layer, imageObj *image);
-
 int msDrawVectorLayer(mapObj *map, layerObj *layer, imageObj *image);
-
 int msDrawQueryLayer(mapObj *map, layerObj *layer, imageObj *image);
-
 int msDrawWMSLayer(mapObj *map, layerObj *layer, imageObj *image);
 
-int msDrawShape(mapObj *map, layerObj *layer, shapeObj *shape, imageObj *image, int overlay);
+int msDrawShape(mapObj *map, layerObj *layer, shapeObj *shape, imageObj *image, int style);
 int msDrawPoint(mapObj *map, layerObj *layer, pointObj *point, imageObj *image, int classindex, char *labeltext);
 
 void msCircleDrawLineSymbol(symbolSetObj *symbolset, imageObj *image, pointObj *p, double r, styleObj *style, double scalefactor);
@@ -1057,22 +1052,16 @@ void msDrawMarkerSymbol(symbolSetObj *symbolset,imageObj *image, pointObj *p, st
 void msDrawLineSymbol(symbolSetObj *symbolset, imageObj *image, shapeObj *p, styleObj *style, double scalefactor);
 void msDrawShadeSymbol(symbolSetObj *symbolset, imageObj *image, shapeObj *p, styleObj *style, double scalefactor);
 
-int msDrawLabel(imageObj *image, pointObj labelPnt, char *string, 
-                labelObj *label, fontSetObj *fontset, double scalefactor);
-
-int msDrawText(imageObj *image, pointObj labelPnt, char *string, 
-              labelObj *label, fontSetObj *fontset, double scalefactor);
-
+int msDrawLabel(imageObj *image, pointObj labelPnt, char *string, labelObj *label, fontSetObj *fontset, double scalefactor);
+int msDrawText(imageObj *image, pointObj labelPnt, char *string, labelObj *label, fontSetObj *fontset, double scalefactor);
 int msDrawLabelCache(imageObj *image, mapObj *map);
 
 void msImageStartLayer(mapObj *map, layerObj *layer, imageObj *image);
 void msImageEndLayer(mapObj *map, layerObj *layer, imageObj *image);
 
 
-void msDrawStartShape(mapObj *map, layerObj *layer, imageObj *image,  
-                      shapeObj *shape);
-void msDrawEndShape(mapObj *map, layerObj *layer, imageObj *image,
-                    shapeObj *shape);
+void msDrawStartShape(mapObj *map, layerObj *layer, imageObj *image, shapeObj *shape);
+void msDrawEndShape(mapObj *map, layerObj *layer, imageObj *image, shapeObj *shape);
 
 
 
diff --git a/maplegend.c b/maplegend.c
index 45abfdaad1..7d84fd3cd3 100644
--- a/maplegend.c
+++ b/maplegend.c
@@ -184,8 +184,6 @@ imageObj *msDrawLegend(mapObj *map)
     size_y += MS_MAX(heights[i], map->legend.keysizey);
   }
 
-  // printf("size: %d,%d\n", size_x, size_y);
-
   /*
   ** Initialize the legend image
   */
@@ -202,6 +200,8 @@ imageObj *msDrawLegend(mapObj *map)
   if(image != NULL)
     msImageInitGD(image, &(map->legend.imagecolor));
 
+  msClearPenValues(map); // just in case the mapfile has already been screwed with
+
   pnt.y = VMARGIN;
     
   /* for(i=0; i<map->numlayers; i++) { */
diff --git a/scalebar.c b/scalebar.c
index 6a349321c9..d3f626f403 100644
--- a/scalebar.c
+++ b/scalebar.c
@@ -24,14 +24,12 @@ int main(int argc, char *argv[])
 
   image = msDrawScalebar(map);
 
-
   if(!image) { 
     msWriteError(stderr);
     exit(0);
   }
 
   msSaveImage(NULL, image, argv[2]);
-
   msFreeImage(image);
 
   msFreeMap(map);