Attempt to fix some IC2 compatibility issues, #657 and #723.