Fix the services