Updating dependencies and fixing resulting breaks