Fixed UnitMovement issues