Fix the service provider bindings