Update deps and fix some errors