64 bit issues fixed