Fixed issues on windows.