Puppet-lint fixes

Simple fixes to work through puppet-lint checks