More breakege on Windows fixes.