Moar library upgrades