CFY-516 minor fixes, mainly for centos