Fix upgrade for new installs