Fixes to movement