Windows portability fixes.