Improved installation on Windows