PUPPET-174 Fix more lint errors