Compatibility fixes for IP4 version.