Update dependencies, minor fixes