Fix32 bit issues