Minor enhancement to Upgrade Activity to match Server Enhancements.