Update dependencies and minor tweaks