more preps for Windows build