RHEL7 fixes, not that it works yet