Upgrade to more recent libs