Various fixes/enhancements

We're including the package in Fedora; here's what we stumbled upon before review.

Please have a look and eventually apply.
Thank you!