Fix joystick support