Some fixes for the Puppet config.