win64 fixes