Fixed order of dist-upgrade.