Fix some issues with 3.7.* Puppet

Initial PR - Will see what comes out the back of the test result