code fixes for service provider