providers.py: Fix regressions