More IA_NA and IA_PD fixes