Client and input manager changes