Some minor fixes to appease puppet lint