Updates to the upgrade scripts