Small fixes for serice providers.