Fixed up Xbox controller support