Add some plumbing to support CentOS 7
improve CentOS 6 64bit support