various fixes

During the package review process in Fedora [1] we found various small issues which are now corrected in this patchset.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1155240#c1