Fix the broken things, upgrade the dependencies