i2c-cpm: Bugfixes