Initial tweaks for RHEL 7