More IA move related changes