Fixes for git checkout and service name in non-default recipes.