Attempt to fix librarian-puppet issues.