Additional fixes for centos