diff --git a/Makefile.wii b/Makefile.wii
index 66b92ca..85ed64f 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -167,14 +167,15 @@ uae.dol: uae.elf
 	@echo ----
 
 # Compilation flags.
-COMMON_FLAGS	:= -g -O2 -ftree-vectorize -ffast-math -pipe -fdiagnostics-show-option $(MACHDEP) -Wall -Wno-unused -Wno-format
+COMMON_FLAGS	:= -g -O3 $(MACHDEP) -Wall -W -Wno-unused -Wno-format -Wno-sign-compare 
 INCLUDES	:=  -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL -I$(PORTLIBS)/include
 DEFINES		:=  -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 \
 		    -DFPUEMU -DAGA -DAUTOCONFIG -DFILESYS \
-		    -DTD_START_HEIGHT=20 -DDRIVESOUND 
+		    -DTD_START_HEIGHT=20 -DDRIVESOUND -DREGPARAM=
 CFLAGS		:= $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
 
-#unused defines; -DCAPS (to enable ipf file) -DFDI2RAW (to enable DFI file)
+#unused defines: -DCAPS (to enable ipf file) -DFDI2RAW (to enable DFI file)
+#unused flags: -ftree-vectorize -ffast-math
 
 # Test link flags.
 LDFLAGS			:= $(COMMON_FLAGS) -L$(LIB_DIR) -L$(PORTLIBS)/lib -L$(DEVKITPRO)/libogc/lib -L$(DEVKITPRO)/libogc/lib/wii -lz -lSDL_ttf -lSDL -lSDL_image -lpng -ljpeg -lfreetype -lfat -lwiiuse -lbte -logc -lm -lwiikeyboard -ltinysmb
@@ -225,7 +226,7 @@ run:
 uae.elf: src/tools/genlinetoscr.exe src/blit.h src/blitfunc.c src/blitfunc.h src/blittable.c src/linetoscr.c $(SYMLINKS) src/target.h src/md-fpp.h src/sysconfig.h $(OBJS)
 	@echo Linking $@
 	@-mkdir -p $(dir $@)
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
+	$(CC) -o $@ $(OBJS) $(LDFLAGS)
 	#keep elf for debugging
 	#cp $@ /tmp/elf
 
diff --git a/images/kb_amiga.png b/images/kb_amiga.png
index 245e641..e8b6708 100644
Binary files a/images/kb_amiga.png and b/images/kb_amiga.png differ
diff --git a/src/driveclick.c b/src/driveclick.c
index d502bb0..70b0c0e 100644
--- a/src/driveclick.c
+++ b/src/driveclick.c
@@ -168,7 +168,7 @@ void driveclick_init (void)
     static char tmp_path[1024];
 
     driveclick_free ();
-    vv = 0;
+    vv = 0; v = 0;
 
     write_log("driveclick init...\n");    
 
diff --git a/src/gui-sdl/gui-sdl.c b/src/gui-sdl/gui-sdl.c
index e56e625..793b07e 100644
--- a/src/gui-sdl/gui-sdl.c
+++ b/src/gui-sdl/gui-sdl.c
@@ -31,7 +31,7 @@
 #ifdef DEBUG_VK
 #define DEBUG_LOG write_log
 #else
-#define DEBUG_LOG(...) do ; while(0)
+#define DEBUG_LOG(...) do {} while(0)
 #endif
 
 extern int usbismount, smbismount, sdismount;
@@ -770,7 +770,7 @@ static void unmount_device()
 #endif			
 }
 
-extern int make_hdf(int size, const char *hdf_path, int blocks_per_track, int surfaces, int block_size);
+extern int make_hdf(unsigned int size, const char *hdf_path, int blocks_per_track, int surfaces, int block_size);
 
 void make_hardfile(void)
 {
@@ -811,7 +811,7 @@ void make_hardfile(void)
 	
 	msgInfo("Creating file",1,NULL);	
 		
-	if (!make_hdf(size, hdf_path, sector, surfaces, blocksize)) 
+	if (!make_hdf((unsigned int) size, hdf_path, sector, surfaces, blocksize)) 
 		msgInfo("Hardfile created",2000,NULL);
 	else
 		msgInfo("Failed to create hardfile",4000,NULL);	
diff --git a/src/gui-sdl/menu.c b/src/gui-sdl/menu.c
index 7b706a8..475e032 100644
--- a/src/gui-sdl/menu.c
+++ b/src/gui-sdl/menu.c
@@ -450,7 +450,7 @@ void menu_print_font(SDL_Surface *screen, int r, int g, int b,
 #define _MAX_STRING 64
 	SDL_Surface *font_surf;
 	SDL_Rect dst = {x, y,  0, 0};
-	SDL_Color color = {r, g, b};
+	SDL_Color color = {r, g, b, 0};
 	char buf[255];
 	unsigned int i;
 
diff --git a/src/make_hdf_wii.c b/src/make_hdf_wii.c
index 424370c..c3c9ce4 100644
--- a/src/make_hdf_wii.c
+++ b/src/make_hdf_wii.c
@@ -75,7 +75,7 @@ static int create_hdf (const char *path, off_t size)
     return -1;
 }
 
-int make_hdf(int size, const char *hdf_path, int blocks_per_track, int surfaces, int block_size)
+int make_hdf(unsigned int size, const char *hdf_path, int blocks_per_track, int surfaces, int block_size)
 {
     char *size_spec;
 	const char *device_name ="DH0";
@@ -89,7 +89,7 @@ int make_hdf(int size, const char *hdf_path, int blocks_per_track, int surfaces,
 	exit (EXIT_FAILURE);
     }
 
-    if ((size >= (1LL << 31)) && (sizeof (off_t) < sizeof (uae_u64))) {
+    if ((size >= (1u << 31)) && (sizeof (off_t) < sizeof (uae_u64))) {
 	write_log ("Specified size too large (2GB file size is maximum).\n");
 	exit (EXIT_FAILURE);
     }