Minor improvements to make it run in rackspace centos 6.3