Upgrade path fixes. Checking for missing dependencies
Update with revert