Minor fixes to finish up librarian support