Fixed bugs using services.