Fixed issues in Windows