some fixes for the provider bug