Fixes for RHEL 7