Some updates for the new upgrade procedure