Updates to puppet scripts