Fix issues raised by puppet-lint