Small bugfixes and https://github.com/autopkg/jessepeterson-recipes/pull/1