CentOS 64 bit fixups
Fix depreciation warnings on templates