deps upgrade and minor fixes