fixes based on https://bugzilla.redhat.com/show_bug.cgi?id=1100899#c3

Signed-off-by: Lehner Florian <dev@der-flo.net>