Improve Portability to MS Win