Fixes for CentOS