diff --git a/Makefile b/Makefile
index e63ee0526f..40053510b1 100644
--- a/Makefile
+++ b/Makefile
@@ -333,15 +333,17 @@ LDFLAGS += -static
 endif
 endif
 
-# If building on Cygwin/MingW don't link with Cygwin libs
+# If building on MingW don't link with Cygwin libs
 ifdef WIN32
-ifdef MINGW
 ifdef CYGWIN
+BASECFLAGS += -mwin32
+LDFLAGS += -mwin32
+endif
+ifdef MINGW
 BASECFLAGS += -mno-cygwin
 LDFLAGS += -mno-cygwin
 endif
 endif
-endif
 
 CFLAGS += $(BASECFLAGS)
 
diff --git a/gfx.c b/gfx.c
index 127a221993..2c5691f25b 100644
--- a/gfx.c
+++ b/gfx.c
@@ -1463,7 +1463,7 @@ static void GfxMainBlitter(byte *sprite, int x, int y, int mode)
 	}
 }
 
-
+#if 0
 static void GfxScalePalette(int pal, byte scaling)
 {
 	byte *dst, *src;
@@ -1482,6 +1482,7 @@ static void GfxScalePalette(int pal, byte scaling)
 		src += 3;
 	} while (--count);
 }
+#endif
 
 void DoPaletteAnimations();
 
@@ -1701,6 +1702,7 @@ void DrawMouseCursor()
 	_cursor.dirty = false;
 }
 
+#if defined(_DEBUG)
 static void DbgScreenRect(int left, int top, int right, int bottom)
 {
 	DrawPixelInfo dp,*old;
@@ -1711,6 +1713,7 @@ static void DbgScreenRect(int left, int top, int right, int bottom)
 	GfxFillRect(left, top, right-1, bottom-1, rand() & 255);
 	_cur_dpi = old;
 }
+#endif
 
 extern bool _dbg_screen_rect;
 
diff --git a/sdl.c b/sdl.c
index 88940d0913..1fabe26661 100644
--- a/sdl.c
+++ b/sdl.c
@@ -325,7 +325,7 @@ static bool CreateMainSurface(int w, int h)
 
 	GetAvailableVideoMode(&w, &h);
 
-	DEBUG(misc, 0) ("sdl: using mode %dx%d", w, h);
+	DEBUG(misc, 1) ("sdl: using mode %dx%d", w, h);
 
 	// DO NOT CHANGE TO HWSURFACE, IT DOES NOT WORK
 	newscreen = SDL_CALL SDL_SetVideoMode(w, h, 8, SDL_SWSURFACE | SDL_HWPALETTE | (_fullscreen ? SDL_FULLSCREEN : SDL_RESIZABLE));
@@ -542,7 +542,7 @@ static const char *SdlVideoStart(char **parm)
 	if (s != NULL) return s;
 
 	SDL_CALL SDL_VideoDriverName(buf, 30);
-	DEBUG(misc, 0) ("sdl: using driver '%s'", buf);
+	DEBUG(misc, 1) ("sdl: using driver '%s'", buf);
 
 	GetVideoModes();
 	CreateMainSurface(_cur_resolution[0], _cur_resolution[1]);