More win64 fixes