OnMove Event feedback fixes