More puppet-lint compliancy fixes