Improve operability with librarian-puppet