first set of fixes for CentOS 7 compatibility