Update dependencies, and fix incompabilities