Fixes for CentOS 7