rhel5 build fixes
rhel5 build fixes