Second pass through RHEL fixes.