Fixes to the joystick interface