Update dependencies. Minor fixes