GsControls fixes