Fixes for RHEL based Systems