diff --git a/checkin_notes b/checkin_notes
index 75348481bf..5e3a46cc5f 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -9060,7 +9060,7 @@ David  10 Nov 2009
     client/
         cs_account.cpp
 
-David  10 Nov 2009
+David  11 Nov 2009
     - unix build: fix "out of tree" build (what's that?)
         from Oliver Bock
 
@@ -9090,3 +9090,17 @@ Rom    11 Nov 2009
         coproc.cpp
     win_build/
         *.vcproj
+
+David  11 Nov 2009
+    - client: fix yesterday's checkin to remove restrictions
+        on GUI RPC request elements.
+        You can now use either <foo></foo> or <foo/>
+        for empty request messages.
+    - GUI RPC client library: fix double-free bug.
+        it's not clear how this ever worked.
+
+    client
+        gui_rpc_server_ops.cpp
+    lib/
+        coproc.cpp
+        gui_rpc_client.cpp
diff --git a/client/gui_rpc_server_ops.cpp b/client/gui_rpc_server_ops.cpp
index b02e9b0e92..0bc71e2ed8 100644
--- a/client/gui_rpc_server_ops.cpp
+++ b/client/gui_rpc_server_ops.cpp
@@ -1057,6 +1057,11 @@ static void handle_set_cc_config(char* buf, MIOFILE& fout) {
     );
 }
 
+// Some of the RPCs have empty-element request messages.
+// We accept both <foo/> and <foo></foo>
+//
+#define match_req(buf, tag) (match_tag(buf, "<" tag ">") || match_tag(buf, "<" tag "/>"))
+
 int GUI_RPC_CONN::handle_rpc() {
     char request_msg[4096];
     int n, retval=0;
@@ -1088,14 +1093,14 @@ int GUI_RPC_CONN::handle_rpc() {
     // - if we get an unexpected auth1 or auth2, disconnect
 
     mf.printf("<boinc_gui_rpc_reply>\n");
-    if (match_tag(request_msg, "<auth1")) {
+    if (match_req(request_msg, "auth1")) {
         if (got_auth1 && auth_needed) {
             retval = ERR_AUTHENTICATOR;
         } else {
             handle_auth1(mf);
             got_auth1 = true;
         }
-    } else if (match_tag(request_msg, "<auth2")) {
+    } else if (match_req(request_msg, "auth2")) {
         if ((!got_auth1 || got_auth2) && auth_needed) {
             retval = ERR_AUTHENTICATOR;
         } else {
@@ -1114,41 +1119,41 @@ int GUI_RPC_CONN::handle_rpc() {
     // sharing this computer (e.g. what jobs are running)
     // but not for anything sensitive (passwords etc.)
 
-    } else if (match_tag(request_msg, "<exchange_versions")) {
+    } else if (match_req(request_msg, "exchange_versions")) {
         handle_exchange_versions(mf);
-    } else if (match_tag(request_msg, "<get_state")) {
+    } else if (match_req(request_msg, "get_state")) {
         gstate.write_state_gui(mf);
-    } else if (match_tag(request_msg, "<get_results")) {
+    } else if (match_req(request_msg, "get_results")) {
         bool active_only = false;
         parse_bool(request_msg, "active_only", active_only);
         mf.printf("<results>\n");
         gstate.write_tasks_gui(mf, active_only);
         mf.printf("</results>\n");
-    } else if (match_tag(request_msg, "<get_screensaver_tasks")) {
+    } else if (match_req(request_msg, "get_screensaver_tasks")) {
         handle_get_screensaver_tasks(mf);
-    } else if (match_tag(request_msg, "<result_show_graphics")) {
+    } else if (match_req(request_msg, "result_show_graphics")) {
         handle_result_show_graphics(request_msg, mf);
-    } else if (match_tag(request_msg, "<get_file_transfers")) {
+    } else if (match_req(request_msg, "get_file_transfers")) {
         gstate.write_file_transfers_gui(mf);
-    } else if (match_tag(request_msg, "<get_simple_gui_info")) {
+    } else if (match_req(request_msg, "get_simple_gui_info")) {
         handle_get_simple_gui_info(mf);
-    } else if (match_tag(request_msg, "<get_project_status")) {
+    } else if (match_req(request_msg, "get_project_status")) {
         handle_get_project_status(mf);
-    } else if (match_tag(request_msg, "<get_disk_usage")) {
+    } else if (match_req(request_msg, "get_disk_usage")) {
         handle_get_disk_usage(mf);
-    } else if (match_tag(request_msg, "<get_messages")) {
+    } else if (match_req(request_msg, "get_messages")) {
         handle_get_messages(request_msg, mf);
-    } else if (match_tag(request_msg, "<get_message_count")) {
+    } else if (match_req(request_msg, "get_message_count")) {
         handle_get_message_count(request_msg, mf);
-    } else if (match_tag(request_msg, "<get_host_info")) {
+    } else if (match_req(request_msg, "get_host_info")) {
         handle_get_host_info(request_msg, mf);
-    } else if (match_tag(request_msg, "<get_statistics")) {
+    } else if (match_req(request_msg, "get_statistics")) {
         handle_get_statistics(request_msg, mf);
-    } else if (match_tag(request_msg, "<get_newer_version")) {
+    } else if (match_req(request_msg, "get_newer_version")) {
         handle_get_newer_version(mf);
-    } else if (match_tag(request_msg, "<get_cc_status")) {
+    } else if (match_req(request_msg, "get_cc_status")) {
         handle_get_cc_status(this, mf);
-    } else if (match_tag(request_msg, "<get_all_projects_list")) {
+    } else if (match_req(request_msg, "get_all_projects_list")) {
         read_all_projects_list_file(mf);
 
     // Operations that require authentication start here
@@ -1159,64 +1164,64 @@ int GUI_RPC_CONN::handle_rpc() {
             retval = ERR_AUTHENTICATOR;
         }
         sent_unauthorized = true;
-    } else if (match_tag(request_msg, "<project_nomorework")) {
+    } else if (match_req(request_msg, "project_nomorework")) {
          handle_project_op(request_msg, mf, "nomorework");
-     } else if (match_tag(request_msg, "<project_allowmorework")) {
+     } else if (match_req(request_msg, "project_allowmorework")) {
          handle_project_op(request_msg, mf, "allowmorework");
-    } else if (match_tag(request_msg, "<project_detach_when_done")) {
+    } else if (match_req(request_msg, "project_detach_when_done")) {
          handle_project_op(request_msg, mf, "detach_when_done");
-    } else if (match_tag(request_msg, "<project_dont_detach_when_done")) {
+    } else if (match_req(request_msg, "project_dont_detach_when_done")) {
          handle_project_op(request_msg, mf, "dont_detach_when_done");
-    } else if (match_tag(request_msg, "<set_network_mode")) {
+    } else if (match_req(request_msg, "set_network_mode")) {
         handle_set_network_mode(request_msg, mf);
-    } else if (match_tag(request_msg, "<run_benchmarks")) {
+    } else if (match_req(request_msg, "run_benchmarks")) {
         handle_run_benchmarks(request_msg, mf);
-    } else if (match_tag(request_msg, "<get_proxy_settings")) {
+    } else if (match_req(request_msg, "get_proxy_settings")) {
         handle_get_proxy_settings(request_msg, mf);
-    } else if (match_tag(request_msg, "<set_proxy_settings")) {
+    } else if (match_req(request_msg, "set_proxy_settings")) {
         handle_set_proxy_settings(request_msg, mf);
-    } else if (match_tag(request_msg, "<network_available")) {
+    } else if (match_req(request_msg, "network_available")) {
         handle_network_available(request_msg, mf);
-    } else if (match_tag(request_msg, "<abort_file_transfer")) {
+    } else if (match_req(request_msg, "abort_file_transfer")) {
         handle_file_transfer_op(request_msg, mf, "abort");
-    } else if (match_tag(request_msg, "<project_detach")) {
+    } else if (match_req(request_msg, "project_detach")) {
         handle_project_op(request_msg, mf, "detach");
-    } else if (match_tag(request_msg, "<abort_result")) {
+    } else if (match_req(request_msg, "abort_result")) {
         handle_result_op(request_msg, mf, "abort");
-    } else if (match_tag(request_msg, "<suspend_result")) {
+    } else if (match_req(request_msg, "suspend_result")) {
         handle_result_op(request_msg, mf, "suspend");
-    } else if (match_tag(request_msg, "<resume_result")) {
+    } else if (match_req(request_msg, "resume_result")) {
         handle_result_op(request_msg, mf, "resume");
-    } else if (match_tag(request_msg, "<project_suspend")) {
+    } else if (match_req(request_msg, "project_suspend")) {
         handle_project_op(request_msg, mf, "suspend");
-    } else if (match_tag(request_msg, "<project_resume")) {
+    } else if (match_req(request_msg, "project_resume")) {
         handle_project_op(request_msg, mf, "resume");
-    } else if (match_tag(request_msg, "<set_run_mode")) {
+    } else if (match_req(request_msg, "set_run_mode")) {
         handle_set_run_mode(request_msg, mf);
-    } else if (match_tag(request_msg, "<quit")) {
+    } else if (match_req(request_msg, "quit")) {
         handle_quit(request_msg, mf);
-    } else if (match_tag(request_msg, "<acct_mgr_info")) {
+    } else if (match_req(request_msg, "acct_mgr_info")) {
         handle_acct_mgr_info(request_msg, mf);
-    } else if (match_tag(request_msg, "<read_global_prefs_override")) {
+    } else if (match_req(request_msg, "read_global_prefs_override")) {
         mf.printf("<success/>\n");
         gstate.read_global_prefs();
         gstate.request_schedule_cpus("Preferences override");
         gstate.request_work_fetch("Preferences override");
-    } else if (match_tag(request_msg, "<get_project_init_status")) {
+    } else if (match_req(request_msg, "get_project_init_status")) {
         handle_get_project_init_status(request_msg, mf);
-    } else if (match_tag(request_msg, "<get_global_prefs_file")) {
+    } else if (match_req(request_msg, "get_global_prefs_file")) {
         handle_get_global_prefs_file(mf);
-    } else if (match_tag(request_msg, "<get_global_prefs_working")) {
+    } else if (match_req(request_msg, "get_global_prefs_working")) {
         handle_get_global_prefs_working(mf);
-    } else if (match_tag(request_msg, "<get_global_prefs_override")) {
+    } else if (match_req(request_msg, "get_global_prefs_override")) {
         handle_get_global_prefs_override(mf);
-    } else if (match_tag(request_msg, "<set_global_prefs_override")) {
+    } else if (match_req(request_msg, "set_global_prefs_override")) {
         handle_set_global_prefs_override(request_msg, mf);
-    } else if (match_tag(request_msg, "<get_cc_config")) {
+    } else if (match_req(request_msg, "get_cc_config")) {
         handle_get_cc_config(mf);
-    } else if (match_tag(request_msg, "<set_cc_config")) {
+    } else if (match_req(request_msg, "set_cc_config")) {
         handle_set_cc_config(request_msg, mf);
-    } else if (match_tag(request_msg, "<read_cc_config")) {
+    } else if (match_req(request_msg, "read_cc_config")) {
         mf.printf("<success/>\n");
         read_config_file(false);
         msg_printf(0, MSG_INFO, "Re-read config file");
@@ -1225,7 +1230,7 @@ int GUI_RPC_CONN::handle_rpc() {
         gstate.set_ncpus();
         gstate.request_schedule_cpus("Core client configuration");
         gstate.request_work_fetch("Core client configuration");
-    } else if (match_tag(request_msg, "<set_debts")) {
+    } else if (match_req(request_msg, "set_debts")) {
         handle_set_debts(request_msg, mf);
     } else {
 
@@ -1237,31 +1242,31 @@ int GUI_RPC_CONN::handle_rpc() {
         double saved_time = gstate.gui_rpcs.time_of_last_rpc_needing_network;
         gstate.gui_rpcs.time_of_last_rpc_needing_network = gstate.now;
 
-        if (match_tag(request_msg, "<retry_file_transfer")) {
+        if (match_req(request_msg, "retry_file_transfer")) {
             handle_file_transfer_op(request_msg, mf, "retry");
-        } else if (match_tag(request_msg, "<project_reset")) {
+        } else if (match_req(request_msg, "project_reset")) {
             handle_project_op(request_msg, mf, "reset");
-        } else if (match_tag(request_msg, "<project_update")) {
+        } else if (match_req(request_msg, "project_update")) {
             handle_project_op(request_msg, mf, "update");
-        } else if (match_tag(request_msg, "<get_project_config")) {
+        } else if (match_req(request_msg, "get_project_config")) {
             handle_get_project_config(request_msg, mf);
-        } else if (match_tag(request_msg, "<get_project_config_poll")) {
+        } else if (match_req(request_msg, "get_project_config_poll")) {
             handle_get_project_config_poll(request_msg, mf);
-        } else if (match_tag(request_msg, "<lookup_account")) {
+        } else if (match_req(request_msg, "lookup_account")) {
             handle_lookup_account(request_msg, mf);
-        } else if (match_tag(request_msg, "<lookup_account_poll")) {
+        } else if (match_req(request_msg, "lookup_account_poll")) {
             handle_lookup_account_poll(request_msg, mf);
-        } else if (match_tag(request_msg, "<create_account")) {
+        } else if (match_req(request_msg, "create_account")) {
             handle_create_account(request_msg, mf);
-        } else if (match_tag(request_msg, "<create_account_poll")) {
+        } else if (match_req(request_msg, "create_account_poll")) {
             handle_create_account_poll(request_msg, mf);
-        } else if (match_tag(request_msg, "<project_attach")) {
+        } else if (match_req(request_msg, "project_attach")) {
             handle_project_attach(request_msg, mf);
-        } else if (match_tag(request_msg, "<project_attach_poll")) {
+        } else if (match_req(request_msg, "project_attach_poll")) {
             handle_project_attach_poll(request_msg, mf);
-        } else if (match_tag(request_msg, "<acct_mgr_rpc")) {
+        } else if (match_req(request_msg, "acct_mgr_rpc")) {
             handle_acct_mgr_rpc(request_msg, mf);
-        } else if (match_tag(request_msg, "<acct_mgr_rpc_poll")) {
+        } else if (match_req(request_msg, "acct_mgr_rpc_poll")) {
             handle_acct_mgr_rpc_poll(request_msg, mf);
 
         // DON'T JUST ADD NEW RPCS HERE - THINK ABOUT THEIR
diff --git a/lib/coproc.cpp b/lib/coproc.cpp
index 270008a679..1ee7f73139 100644
--- a/lib/coproc.cpp
+++ b/lib/coproc.cpp
@@ -416,6 +416,8 @@ void COPROC_CUDA::get(
         warnings.push_back(buf);
         return;
     }
+    sprintf(buf, "NVIDIA library reports %d GPU%s", count, (count==1)?"":"s");
+    warnings.push_back(buf);
 
     int j;
     unsigned int i;
diff --git a/lib/gui_rpc_client.cpp b/lib/gui_rpc_client.cpp
index 9a510292fb..893f77b2bf 100644
--- a/lib/gui_rpc_client.cpp
+++ b/lib/gui_rpc_client.cpp
@@ -219,6 +219,7 @@ int RPC_CLIENT::authorize(const char* passwd) {
     }
 
     free(rpc.mbuf);
+    rpc.mbuf = 0;
 
     if (!found) {
         //fprintf(stderr, "Nonce not found\n");