Tons of dependency fixes and updates