Library upgrades

Test failure fix.