Origin RHEL & Fedora build fixes.