more x86 issues fixed for windows