Win64 fixes