More fixes (Centos is hard!)