Keyboard mapping fixups, joystick leftovers removed