Fix joystick-related desync