Windows portability fixes