Update dependencies and small  fixes