diff --git a/dbus/dbus-file-win.c b/dbus/dbus-file-win.c
index 932b459c..4f0b0759 100644
--- a/dbus/dbus-file-win.c
+++ b/dbus/dbus-file-win.c
@@ -68,8 +68,6 @@ _dbus_file_read (HANDLE            hnd,
 
   data = _dbus_string_get_data_len (buffer, start, count);
 
- again:
-
   result = ReadFile (hnd, data, count, &bytes_read, NULL);
   if (result == 0)
     {
@@ -114,7 +112,7 @@ _dbus_file_get_contents (DBusString       *str,
   DWORD fsize;
   DWORD fsize_hi;
   int orig_len;
-  int total;
+  unsigned int total;
   const char *filename_c;
 
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index 0b8ca267..75d00aca 100644
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -56,7 +56,7 @@ indent (int depth)
 static void
 print_hex (unsigned char *bytes, unsigned int len, int depth)
 {
-  int i, columns;
+  unsigned int i, columns;
 
   printf ("array of bytes [\n");