More i2 fixes