Update deps and fix resulting incompatibilties