Build improvements from airbase

And library upgrades