Fix some joystick mapping errors, a minor bug