BZ894081 Various micro-fixes

Some small fixes for problems described at

https://bugzilla.redhat.com/show_bug.cgi?id=894081