Minor fixes to Gamepad and LightTest.