More lib tweaks