IN and IA and more fixes