Fixed remaining problems on Windows.