Bug fixes

Corrected a few bug fixes introduced into the setup.exe file with the
last update