Tom/Raph - Centos fixes