ipif fixes