Minor build dependency upgrades