Fixed references to services.