Minor changes related to simplified IvP model