Fix typos and missing Joystick::
Merge pull request #562 from CheezeCake/master

Fixed compile errors on FreeBSD