More fixes and improvements to game pad support