I2C minor changes