More joystick fixes.