Installer updates to fix issues on Windows