Fix issues according to BZ review

https://bugzilla.redhat.com/show_bug.cgi?id=989775#c1