Update dependencies
Minor tweaks