diff --git a/clientscr/screensaver.cpp b/clientscr/screensaver.cpp
index 03aeffaa4e..326f6f43d9 100644
--- a/clientscr/screensaver.cpp
+++ b/clientscr/screensaver.cpp
@@ -305,8 +305,6 @@ void *CScreensaver::DataManagementProc() {
     double          last_change_time        = 0.0;
     double          last_run_check_time     = 0.0;
 #ifdef _WIN32
-    time_t  m_tThreadCreateTime = 0;
-
     BOINCTRACE(_T("CScreensaver::DataManagementProc - Display screen saver loading message\n"));
     SetError(TRUE, SCRAPPERR_BOINCSCREENSAVERLOADING);
     m_tThreadCreateTime = time(0);
diff --git a/clientscr/screensaver_win.cpp b/clientscr/screensaver_win.cpp
index aae68b70ba..df2f8d31b3 100755
--- a/clientscr/screensaver_win.cpp
+++ b/clientscr/screensaver_win.cpp
@@ -1010,10 +1010,11 @@ BOOL CScreensaver::DestroyDataManagementThread() {
     m_QuitDataManagementProc = TRUE;  // Tell RPC Thread to exit
     
     // Wait up to 5 seconds for DataManagementThread to exit
-    for (int i=0; i< 20; i++) {
+    for (int i=0; i<50; i++) {
         DWORD dwStatus = STILL_ACTIVE;
         BOOL  bRetVal = FALSE;
-        
+
+		boinc_sleep(0.1);
         bRetVal = GetExitCodeThread(m_hDataManagementThread, &dwStatus);
         BOINCTRACE(_T("CScreensaver::DestroyDataManagementThread - GetExitCodeThread RetVal = '%d', Status = '%d'\n"), bRetVal, dwStatus);
         if (bRetVal && (dwStatus != STILL_ACTIVE)) {