Fixed some joystick bugs