Library - fixes

-