Config provider fixes