Upgrade first, to avoid install errors