Compatibility fixes for IP4