More fixes for CentOS 7.