Rhel7 configuration fixes

No code changes.