Fixed joystick stuff