More ic2 fixes