Upgrade, lib dev fix