Guard against no service_slug, fix bug with new services