Gen III: Preliminary move fixes.