More Win64 fixes