More stuff to fix RHEL6 builds.