Made the 64-bit check automatic while I was at it