Fixes for gamepad