diff --git a/src/jd-sdl/joystick.c b/src/jd-sdl/joystick.c
index bba7add..c5b7acd 100644
--- a/src/jd-sdl/joystick.c
+++ b/src/jd-sdl/joystick.c
@@ -41,7 +41,7 @@ void Rumble(unsigned int nr, unsigned int i, int bs)
 		Uint32 cur_ticks;
 		static bool rumble_on[2];
 		static bool fire_pressed[2];
-		static int joystickbutton_fire[2]={-1,-1,-1,-1,-1,-1};
+		static int joystickbutton_fire[2]={-1,-1};
 		int kc;
 		
 		if (nr>1) return;
diff --git a/uaerc.wii b/uaerc.wii
index ac83218..4bbf657 100644
--- a/uaerc.wii
+++ b/uaerc.wii
@@ -122,7 +122,7 @@ input.1.keyboard.0.button.96=SPC_ENTERGUI
 input.1.mouse.0.disabled=0
 input.1.mouse.0.axis.0=MOUSE1_HORIZ
 input.1.mouse.0.axis.1=MOUSE1_VERT
-input.1.mouse.0.axis.2=MOUSE1_WHEEL
+#input.1.mouse.0.axis.2=MOUSE1_WHEEL
 
 # Mouse 2 disabled by default since Wii SDL uses wiimote 1 only
 input.1.mouse.1.disabled=1
@@ -205,21 +205,21 @@ input.1.joystick.4.button.7=SPC_ENTERGUI
 #input.1.joystick.4.button.1=JOY2_2ND_BUTTON
 
 # The "hat" on the gamepad (dpad)
-#input.1.joystick.4.axis.6=JOY2_HORIZ
-#input.1.joystick.4.axis.7=JOY2_VERT
+input.1.joystick.4.axis.6=JOY2_HORIZ
+input.1.joystick.4.axis.7=JOY2_VERT
 
 #GAME PAD 2 as Joystick 1
-input.1.joystick.5.disabled=0 
-input.1.joystick.5.axis.0=JOY1_HORIZ
-input.1.joystick.5.axis.1=JOY1_VERT
+#input.1.joystick.5.disabled=0 
+#input.1.joystick.5.axis.0=JOY1_HORIZ
+#input.1.joystick.5.axis.1=JOY1_VERT
 
 #The C Joystick
 #input.1.joystick.5.axis.2=JOY2_HORIZ
 #input.1.joystick.5.axis.3=JOY2_VERT
 
 #Buttons A, start and B
-input.1.joystick.5.button.0=JOY1_FIRE_BUTTON 
-input.1.joystick.5.button.7=SPC_ENTERGUI 
+#input.1.joystick.5.button.0=JOY1_FIRE_BUTTON 
+#input.1.joystick.5.button.7=SPC_ENTERGUI 
 #input.1.joystick.5.button.1=JOY2_2ND_BUTTON
 
 # The "hat" on the gamepad (dpad)