Provider fixes

Fixes #3097 #3086  #3106