Game controller fixes