small RHEL 5 build fixes