EL7 Fixes for CentOS