More IC2 compatibility fixes