diff --git a/ChangeLog b/ChangeLog
index 6ca624b12..8b2efd775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2011-07-10  Robert Larice
+ * src/winmain.c ,
+ * src/frontend/wdisp/winprint.c :
+   cleanup integer type conversions
+
 2011-07-10  Robert Larice
  * src/frontend/wdisp/windisp.c :
-  SetWindowLongPtr() and SetClassLongPtr() for 64bit compatibility
+   SetWindowLongPtr() and SetClassLongPtr() for 64bit compatibility
 
 2011-07-09  Holger Vogt
  * input.c: definition of _read only for Windows console
diff --git a/src/frontend/wdisp/winprint.c b/src/frontend/wdisp/winprint.c
index 23db4a3de..3b67b703c 100644
--- a/src/frontend/wdisp/winprint.c
+++ b/src/frontend/wdisp/winprint.c
@@ -285,7 +285,7 @@ int WPRINT_NewViewport( GRAPH * graph)
 		align = GetTextAlign( PrinterDC);
 		SetTextAlign( PrinterDC, TA_RIGHT | TA_TOP | TA_NOUPDATECP);
 		TextOut( PrinterDC, PrinterWidth-graph->fontwidth, 1, graph->plotname,
-			strlen(graph->plotname));
+			(int)strlen(graph->plotname));
 		SetTextAlign( PrinterDC, align);
 	}
 
@@ -418,7 +418,7 @@ int WPRINT_Text( char * text, int x, int y, int degrees)
 	}
 
 	SetTextColor( PrinterDC, ColorTable[ColIndex]);
-	TextOut( PrinterDC, x, PrinterHeight - y - currentgraph->fontheight, text, strlen(text));
+	TextOut( PrinterDC, x, PrinterHeight - y - currentgraph->fontheight, text, (int) strlen(text));
 	return (0);
 }
 
diff --git a/src/winmain.c b/src/winmain.c
index df2897935..57301e2c3 100644
--- a/src/winmain.c
+++ b/src/winmain.c
@@ -604,7 +604,7 @@ static void Element_OnPaint(HWND hwnd)
     o = GetStockObject( LTGRAY_BRUSH);
     FillRect( hdc, &s, o);
     SetBkMode( hdc, TRANSPARENT);
-    ExtTextOut( hdc, s.left+1, s.top+1, ETO_CLIPPED, &s, buffer, i, NULL);
+    ExtTextOut( hdc, s.left+1, s.top+1, ETO_CLIPPED, &s, buffer, (unsigned)i, NULL);
 
     /* End */
     EndPaint( hwnd, &ps);
@@ -731,7 +731,7 @@ static int MakeArgcArgv(char *cmdline,int *argc,char ***argv)
         }
     }
     /* malloc an argv */
-    tmpargv = (char**)malloc(numargs * sizeof(char *));
+    tmpargv = (char**)malloc((unsigned)numargs * sizeof(char *));
     if (NULL == tmpargv)
     {
         status = -1;