Ongoing puppet compatibility upgrades