Tweaks for services and the grade push