Work on puppet upgrades