Making more fixes to move generator.