Correct return values for all services.