Undid some 64/32 bit changes for now