Fix the service definitions