Joystick fixes for issue #16