Mostly ScopeI2C related changes.