Some more tweaks to try to get I2C working.