more fixes regarding centos, r=rhelmer