Fix issues for BZ review
Merge branch 'master' of github.com:axilleas/fedora