Another upgrade fix.
Upgrade fetching fix.
Fix deletion in case of upgrade.