Bunch of small puppet changes.