Fixed SONAR define, adjust I2C reg,