Fixes for CentOS/Rhel installs