Fixing up build procedure to handle library upgrades