Winstaller bug fixes