more fixes for the move