more 64 bit changes