Fix some Puppet warnings/errors