Provider fixes

Fixes #3097 #3086  #3106
Merge pull request #3109 from mano3m/develop_provider

Provider fixes