diff --git a/checkin_notes b/checkin_notes
index 0ab50e0b53..641986852f 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -4390,5 +4390,14 @@ Rom    2 May 2006
         BOINCGUIApp.cpp, .h
         MainFrame.cpp
 
+Rom    2 May 2006
+    - Bug Fix: Calculate the page size after the OnChangedEvent is fired
+        and then set the dialog size.  Should keep the wizard pages from
+        clipping the text.
+    - Bug Fix: Change the process execution code to use wxExecute since
+        it is async.  If for some reason the old screensaver doesn't
+        get replaced by setup, we don't want to block the main UI thread.
         
-      
\ No newline at end of file
+    clientgui/
+        BOINCGUIApp.cpp
+        wizardex.cpp
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 9bed8dd923..5afdae1295 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -955,18 +955,7 @@ int CBOINCGUIApp::StartBOINCScreensaverTest() {
 #ifdef __WXMSW__
     wxString strExecute = wxEmptyString;
     wxChar   szExecutableDirectory[4096];
-    PROCESS_INFORMATION pi;
-    STARTUPINFO         si;
-    BOOL                bProcessStarted;
-
     memset(szExecutableDirectory, 0, sizeof(szExecutableDirectory));
-    memset(&pi, 0, sizeof(pi));
-    memset(&si, 0, sizeof(si));
-
-    si.cb = sizeof(si);
-    si.dwFlags = STARTF_USESHOWWINDOW;
-    si.wShowWindow = SW_HIDE;
-
 
     // On Windows the screensaver is located in the Windows directory.
     GetWindowsDirectory(
@@ -974,21 +963,9 @@ int CBOINCGUIApp::StartBOINCScreensaverTest() {
         (sizeof(szExecutableDirectory) / sizeof(wxChar))
     );
 
-    // Append boinc.exe to the end of the strExecute string and get ready to rock
-    strExecute = wxT("\"") + wxString(szExecutableDirectory) + wxT("\\boinc.scr\" /test");
-
-    bProcessStarted = CreateProcess(
-        NULL,
-        (LPTSTR)strExecute.c_str(),
-        NULL,
-        NULL,
-        FALSE,
-        CREATE_NEW_PROCESS_GROUP|CREATE_NO_WINDOW,
-        NULL,
-        szExecutableDirectory,
-        &si,
-        &pi
-    );
+    // Append boinc.scr to the end of the strExecute string and get ready to rock
+    strExecute = wxT("\"") + wxString(szExecutableDirectory) + wxT("\\boinc.scr\" /t");
+    ::wxExecute(strExecute);
 #endif
     return 0;
 }
diff --git a/clientgui/wizardex.cpp b/clientgui/wizardex.cpp
index dd2a6cb53c..032ddf412b 100644
--- a/clientgui/wizardex.cpp
+++ b/clientgui/wizardex.cpp
@@ -510,9 +510,6 @@ bool wxWizardEx::ShowPage(wxWizardPageEx *page, bool goingForward)
     // position and show the new page
     (void)m_page->TransferDataToWindow();
 
-    // wxWizardSizer::RecalcSizes wants to be called when m_page changes
-    m_sizerPage->RecalcSizes();
-
     // check if bitmap needs to be updated
     // update default flag as well
     if ( m_page->GetBitmap().Ok() )
@@ -557,6 +554,9 @@ bool wxWizardEx::ShowPage(wxWizardPageEx *page, bool goingForward)
     wxWizardExEvent event(wxEVT_WIZARDEX_PAGE_CHANGED, GetId(), goingForward, m_page);
     (void)m_page->GetEventHandler()->ProcessEvent(event);
 
+    // wxWizardSizer::RecalcSizes wants to be called when m_page changes
+    m_sizerPage->RecalcSizes();
+
     // and finally show it
     m_page->Show();
     m_page->SetFocus();
diff --git a/win_build/boincmgr_curl.vcproj b/win_build/boincmgr_curl.vcproj
index 1207db75f4..b49d620c1f 100644
--- a/win_build/boincmgr_curl.vcproj
+++ b/win_build/boincmgr_curl.vcproj
@@ -518,6 +518,12 @@
 			</File>
 			<File
 				RelativePath="..\lib\diagnostics_win.C">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\lib\error_numbers.h">