Ongoing puppet compatibility upgrades (need to deploy to fully test these tweaks remotely)