Backport of more libs