Updated for centos7 to fix various build issues