a couple fixes using services module