Libraries tweaks