Fixing some capacitor control errors