A few fixes/cleanups for the upgrade dialog