More i2c bugfixes