Some more ic2 fixes.