diff --git a/checkin_notes b/checkin_notes
index 159b0537ec..577b98a3e6 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8697,3 +8697,16 @@ David  8 Dec 2010
         util.cpp,h
     sched/
         sched_version.cpp
+
+David  9 Dec 2010
+    - scheduler: in app_plan_sse3(): check for CPU features in
+        p_model as well as p_features;
+        pre-6.x clients report them in p_model.
+    - client: fix bug where "reread config file" didn't update
+        the max log file sizes
+
+    client/
+        main.cpp
+        log_flags.cpp
+    sched/
+        sched_customize.cpp
diff --git a/client/log_flags.cpp b/client/log_flags.cpp
index 45a155b934..b2c1ab26ee 100644
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
@@ -29,11 +29,12 @@
 #include <unistd.h>
 #endif
 
-#include "error_numbers.h"
 #include "common_defs.h"
+#include "diagnostics.h"
+#include "error_numbers.h"
+#include "filesys.h"
 #include "parse.h"
 #include "str_util.h"
-#include "filesys.h"
 
 #include "file_names.h"
 #include "client_state.h"
@@ -490,8 +491,12 @@ int read_config_file(bool init, const char* fname) {
     }
     FILE* f = boinc_fopen(fname, "r");
     if (!f) return ERR_FOPEN;
-    config.parse(f);
+    int retval = config.parse(f);
     fclose(f);
+    if (retval) return retval;
+    diagnostics_set_max_file_sizes(
+        config.max_stdout_file_size, config.max_stderr_file_size
+    );
     return 0;
 }
 
diff --git a/client/main.cpp b/client/main.cpp
index 7eeef4ea81..82306a0455 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -214,12 +214,6 @@ static void init_core_client(int argc, char** argv) {
 
     read_config_file(true);
 
-    // Set the max file sizes of the logs based on user preferences.
-    //
-    diagnostics_set_max_file_sizes(
-        config.max_stdout_file_size, config.max_stderr_file_size
-    );
-
     // Win32 - detach from console if requested
 #ifdef _WIN32
 	if (gstate.detach_console) {
diff --git a/sched/sched_customize.cpp b/sched/sched_customize.cpp
index 8873df0cb5..2f4a2c1653 100644
--- a/sched/sched_customize.cpp
+++ b/sched/sched_customize.cpp
@@ -409,16 +409,20 @@ static inline bool app_plan_nci(
     return true;
 }
 
-// the following is for an app that requires a processor with SSE3,
-// and will run 10% faster if so
+// the following is for an app version that requires a processor with SSE3,
+// and will run 10% faster than the non-SSE3 version
 //
 static inline bool app_plan_sse3(
     SCHEDULER_REQUEST& sreq, HOST_USAGE& hu
 ) {
     downcase_string(sreq.host.p_features);
     if (!strstr(sreq.host.p_features, "sse3")) {
-        //add_no_work_message("Your CPU lacks SSE3");
-        return false;
+        // Pre-6.x clients report CPU features in p_model
+        //
+        if (!strstr(sreq.host.p_model, "sse3")) {
+            //add_no_work_message("Your CPU lacks SSE3");
+            return false;
+        }
     }
     hu.avg_ncpus = 1;
     hu.max_ncpus = 1;