Minor fixes for librarian