Librarian puppet fix

Plus other updates