Tweaks for compilation on RHEL5.