RHEL 7 build fixes