more 64bit changes