Hack for joystick performance

Clean this up once higher priority items are fixed