RHEL Related fixes