Fixes to movement behavior