Small adjustments to MoveManager