Fix up conductivity sensor infrastructure