fixes for provider