i2c.c fixes including: