Library Fixes