fixes for motion