Some updates for newer changes to puppet master