Basic fixes to pass lint checking
Various fixes to pass puppet-lint checking