Minor changes to make it build on RHEL7.