final fixes for librarian