project-wide fixups

Ben Boeckelrequested to merge
ben.boeckel/catalyst:library-fixups into master

Extracted from !23 (merged).

Merge request reports