Fixed issues with installation on Windows