Update dependencies, various small fixes