Fix some of the 64 bit issues