Changes to make it compile on RHEL.