More fixes for provider networks