Fix warnings and errors for puppet-lint

Trivial changes to fix warnings and errors emitted by puppet-lint.