Distro fixes

Fixes to make the install wizard work on Fedora 21