Bug fixes for multiple providers