Further 32 bit issues fixed