Dependency upgrades and minor changes.