Small fixes for CentOS-7.0