Minor changes and dependency upgrades.