Library Fixes and Directory Reports