Some IA improvements