Small fixes for building on RHEL7.