IPS bug fixes and improvements