provider fixes