Fixed small issues for Windows.