More Centos specific build error fixes