diff --git a/checkin_notes b/checkin_notes
index a5faa8f1ac..a94534ed4d 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8987,3 +8987,14 @@ David  9 Nov 2009
 
     client/
         cs_cmdline.cpp
+
+David  9 Nov 2009
+    - scheduler: maintain WORK_REQ::no_jobs_available correctly
+        for locality scheduling
+    - client: avoid spurious error message when parsing
+        <proxy_info> from cc_config.xml
+
+    client/
+        log_flags.cpp
+    sched/
+        sched_locality.cpp
diff --git a/client/log_flags.cpp b/client/log_flags.cpp
index 1765fd09eb..dd8f35c2ce 100644
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
@@ -292,6 +292,7 @@ int CONFIG::parse_options(XML_PARSER& xp) {
         if (!strcmp(tag, "proxy_info")) {
             int retval = gstate.proxy_info.parse(*xp.f);
             if (retval) return retval;
+            continue;
         }
 #endif
         if (xp.parse_bool(tag, "report_results_immediately", report_results_immediately)) continue;
diff --git a/sched/sched_locality.cpp b/sched/sched_locality.cpp
index e52683e9de..5cd5bdbc2a 100644
--- a/sched/sched_locality.cpp
+++ b/sched/sched_locality.cpp
@@ -271,6 +271,8 @@ static int possibly_send_result(DB_RESULT& result) {
     char buf[256];
     BEST_APP_VERSION* bavp;
 
+    g_wreq->no_jobs_available = false;
+
     retval = wu.lookup_id(result.workunitid);
     if (retval) return ERR_DB_NOT_FOUND;