diff --git a/client/log_flags.C b/client/log_flags.C
index 3b7430d360..ac49218667 100644
--- a/client/log_flags.C
+++ b/client/log_flags.C
@@ -115,7 +115,7 @@ int CONFIG::parse_options(FILE* f) {
 }
 
 int CONFIG::parse(FILE* f) {
-    char tag[256], contents[1024];
+    char tag[256];
 
     memset(this, 0, sizeof(CONFIG));
 
diff --git a/client/main.C b/client/main.C
index 6d3014777c..e959cdf49e 100644
--- a/client/main.C
+++ b/client/main.C
@@ -546,10 +546,11 @@ int boinc_main_loop() {
         DosSleep(0);
 #endif
     }
-    finalize();
+    retval = finalize();
 #ifdef _WIN32
     main_thread_exited = true;
 #endif
+    return retval;
 }
 
 int finalize() {