A few minor fixes based on CentOS testing