Fix issues with templates and Puppet 3.2.2