yet another batch of 64bit changes