Tweaks to some of the sh scripts to work with puppet