windows 32-bit fixes

still need to improve this
way to dependent on my particular build system