Even more Win64 fixes!