diff --git a/setup/Setup.cpp b/setup/Setup.cpp
index 46095764a..93b0f21c2 100755
--- a/setup/Setup.cpp
+++ b/setup/Setup.cpp
@@ -299,8 +299,7 @@ bool CampoSetup::CreateIcon(unsigned int csidl, const wxFileName& strExeFile, co
         // Save the link by calling IPersistFile::Save.
         wxString strPath = fnLnk.GetFullPath();
         wchar_t buff[_MAX_PATH];
-        memset(buff, 0, sizeof(buff));
-        wxConvLocal.MB2WC(buff, strPath, strPath.Len());
+        wxConvLibc.ToWChar(buff, _MAX_PATH, strPath);
         hres = ppf->Save(buff, true); 
         ppf->Release(); 
       } 
diff --git a/setup/wizard.cpp b/setup/wizard.cpp
index 6a19d8d16..60a4fb237 100755
--- a/setup/wizard.cpp
+++ b/setup/wizard.cpp
@@ -481,6 +481,8 @@ bool CampoWizardPage3::ForwardValidate()
         return ErrorBox("Impossibile installare la versione DEMO!\nLa cartella c:/campodemo NON e' vuota!");
 
       GetWizard().SetInstDemoVersion(true);
+      GetWizard().SetPrgLocPath(strPrgDemoPath);
+      GetWizard().SetInstallationType(it_standalone);
     }
 
     //questo lo fa in ogni caso!