Fixed joystick issues