Fixed Dependency Errors After Upgrades