More IC2 Fixes