diff --git a/Makefile.gc b/Makefile.gc
index 122b15a..9f49d3d 100644
--- a/Makefile.gc
+++ b/Makefile.gc
@@ -26,7 +26,7 @@ INCLUDES	:=	source source/m68k source/z80 source/sound source/cart_hw \
 # options for code generation
 #---------------------------------------------------------------------------------
 
-CFLAGS	= -fno-strict-aliasing -O2 -Wall $(MACHDEP) $(INCLUDE) -DWORDS_BIGENDIAN -DNGC="1" -DHW_DOL
+CFLAGS	= -O3 -Wall $(MACHDEP) $(INCLUDE) -DWORDS_BIGENDIAN -DNGC="1" -DHW_DOL
 CXXFLAGS	=	$(CFLAGS)
 
 LDFLAGS	=	$(MACHDEP) -Wl,-Map,$(notdir $@).map
diff --git a/Makefile.wii b/Makefile.wii
index 35d9132..3ad44cc 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -26,7 +26,7 @@ INCLUDES	:=	source source/m68k source/z80 source/sound source/cart_hw\
 # options for code generation
 #---------------------------------------------------------------------------------
 
-CFLAGS	= -O2 -mrvl -Wall $(MACHDEP) -fno-strict-aliasing $(INCLUDE) -DWORDS_BIGENDIAN -DNGC="1" -DHW_RVL
+CFLAGS	= -O3 -mrvl -Wall $(MACHDEP) -fno-strict-aliasing $(INCLUDE) -DWORDS_BIGENDIAN -DNGC="1" -DHW_RVL
 CXXFLAGS	=	$(CFLAGS)
 
 LDFLAGS	=	$(MACHDEP) -Wl,-Map,$(notdir $@).map
diff --git a/source/render.c b/source/render.c
index 29122c6..922b02f 100644
--- a/source/render.c
+++ b/source/render.c
@@ -757,7 +757,7 @@ void render_ntx(int which, int line, uint8 *buf)
   int shift;
   int v_line;
   uint32 atex, atbuf, *src, *dst;
-  uint16 xscroll;
+  uint16 xscroll = 0;
   int y_scroll;
   uint32 *nt;
   uint32 *vs;
@@ -819,7 +819,7 @@ void render_ntx_im2(int which, int line, uint8 *buf, uint8 odd)
   int shift;
   int v_line;
   uint32 atex, atbuf, *src, *dst;
-  uint16 xscroll;
+  uint16 xscroll = 0;
   int y_scroll;
   uint32 *nt;
   uint32 *vs;
@@ -880,7 +880,7 @@ void render_ntx_vs(int which, int line, uint8 *buf)
   int shift;
   int v_line;
   uint32 atex, atbuf, *src, *dst;
-  uint16 xscroll;
+  uint16 xscroll = 0;
   int y_scroll;
   uint32 *nt;
   uint32 *vs;
diff --git a/source/sound/sound.c b/source/sound/sound.c
index 4de595d..3e7e709 100644
--- a/source/sound/sound.c
+++ b/source/sound/sound.c
@@ -164,7 +164,7 @@ void sound_update(void)
 		}
 
     /* samplerate conversion */
-    src_simple (&src_data, SRC_SINC_FASTEST, 2);
+    src_simple (&src_data, svp ? SRC_LINEAR : SRC_SINC_FASTEST, 2);
 
 	  /* this is basically libsamplerate "src_float_to_int_array" function, adapted to interlace samples */
     len = snd.buffer_size;