Update deps and fix BC breaks resulting from update