Minor changes to support Centos 6.3 with gcc 4.7