Fixes to moves