More 64 bit conversion changes