[PATCH] Polished upgradepath code - minor fixes.