Some more IC2 fixes.