Additional updates for upgrade routine.