Multiple changes for RHEL 7support