Provider fixes