Fixes required for Puppet 3.7.3