Fixed IC2 integration, minor cleanup