Portability revisions for Windows