diff --git a/checkin_notes b/checkin_notes
index 1584017e87..d366c42eac 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7982,3 +7982,17 @@ David  2 Nov 2011
         des.h
         ssimp.cpp
         makefile
+
+David  2 Nov 2011
+    - server: plan class names containing 'nvidia' or 'cuda'
+        are assumed to be for NVIDIA GPU apps;
+        plan class names containing 'ati' are assumed to be for AMD GPU apps.
+        Clauses for 'nvidia' were missing in a couple of places.
+
+    sched/
+        sched_customize.cpp
+        sched_version.cpp
+    html/inc/
+        util.inc
+    lib/
+        gui_rpc_client_ops.cpp
diff --git a/html/inc/util.inc b/html/inc/util.inc
index 2dd00bde32..a7da175b43 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -793,6 +793,9 @@ function get_app_types() {
         } else if (strstr($av->plan_class, "cuda")) {
             $t->cuda = true;
             $t->count++;
+        } else if (strstr($av->plan_class, "nvidia")) {
+            $t->cuda = true;
+            $t->count++;
         } else {
             $t->cpu = true;
             $t->count++;
diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp
index 735c588b88..8eacb333f7 100644
--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@@ -2005,6 +2005,7 @@ int RPC_CLIENT::quit() {
     RPC rpc(this);
 
     retval = rpc.do_rpc("<quit/>\n");
+    if (retval) return retval;
     while (rpc.fin.fgets(buf, 256)) {
         if (match_tag(buf, "success")) {
             return 0;
diff --git a/sched/sched_customize.cpp b/sched/sched_customize.cpp
index 52575c350d..5504679635 100644
--- a/sched/sched_customize.cpp
+++ b/sched/sched_customize.cpp
@@ -572,6 +572,9 @@ bool app_plan_uses_gpu(const char* plan_class) {
     if (strstr(plan_class, "cuda")) {
         return true;
     }
+    if (strstr(plan_class, "nvidia")) {
+        return true;
+    }
     if (strstr(plan_class, "ati")) {
         return true;
     }
diff --git a/sched/sched_version.cpp b/sched/sched_version.cpp
index b1a23da662..1075812952 100644
--- a/sched/sched_version.cpp
+++ b/sched/sched_version.cpp
@@ -420,6 +420,7 @@ static double max_32b_address_space() {
 //
 static BEST_APP_VERSION* check_homogeneous_app_version(
     WORKUNIT& wu, bool reliable_only
+    // TODO: enforce reliable_only
 ) {
     static BEST_APP_VERSION bav;