Task: Resolved joystick issues