Fixed some changes that were made to Joystick's definition so that linux matches them.