More lib fixes