IP bug fixes