Fixes from fedora

Review from
https://bugzilla.redhat.com/show_bug.cgi?id=1076863#c15

Signed-off-by: Luis Pabon <lpabon@redhat.com>