diff --git a/checkin_notes b/checkin_notes
index 3e251e1681..290506e020 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8367,3 +8367,15 @@ David  2 Oct 2009
         cs_statefile.cpp
     lib/
         error_numbers.h
+
+David  2 Oct 2009
+	- client: fix bug where if you change project "no CPU/NVIDIA/ATI"
+		prefs and update, the change wouldn't take effect until client restart.
+	- client: fix bug in enforcement of "no CPU/NVIDIA/ATI" prefs
+
+	client/
+		client_state.cpp
+		cs_account.cpp
+		work_fetch.cpp
+	lib/
+		coproc.cpp
diff --git a/client/client_state.cpp b/client/client_state.cpp
index 3350fe9b7a..13b29c57e8 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -277,7 +277,7 @@ int CLIENT_STATE::init() {
         msg_printf(NULL, MSG_INFO, "Faking an NVIDIA GPU");
 #endif
 #if 0
-        fake_ati(coprocs, 2);
+        fake_ati(coprocs, 1);
         msg_printf(NULL, MSG_INFO, "Faking an ATI GPU");
 #endif
         coproc_cuda = (COPROC_CUDA*)coprocs.lookup("CUDA");
diff --git a/client/cs_account.cpp b/client/cs_account.cpp
index e61319c45f..a5df3681c1 100644
--- a/client/cs_account.cpp
+++ b/client/cs_account.cpp
@@ -92,6 +92,9 @@ int PROJECT::parse_account(FILE* in) {
     char buf[256];
     int retval;
     bool in_project_prefs = false;
+    no_cpu = false;
+    no_cuda = false;
+    no_ati = false;
 
     strcpy(master_url, "");
     strcpy(authenticator, "");
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index 10bb48ce49..0f0856af7a 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -74,9 +74,9 @@ bool RSC_WORK_FETCH::may_have_work(PROJECT* p) {
 
 bool RSC_PROJECT_WORK_FETCH::compute_may_have_work(PROJECT* p, int rsc_type) {
     switch(rsc_type) {
-    case RSC_TYPE_CPU: if (p->no_cpu) return false;
-    case RSC_TYPE_CUDA: if (p->no_cuda) return false;
-    case RSC_TYPE_ATI: if (p->no_ati) return false;
+    case RSC_TYPE_CPU: if (p->no_cpu) return false; break;
+    case RSC_TYPE_CUDA: if (p->no_cuda) return false; break;
+    case RSC_TYPE_ATI: if (p->no_ati) return false; break;
     }
     return (backoff_time < gstate.now);
 }
diff --git a/lib/coproc.cpp b/lib/coproc.cpp
index 848011888c..871bdfa944 100644
--- a/lib/coproc.cpp
+++ b/lib/coproc.cpp
@@ -805,7 +805,7 @@ void COPROC_ATI::get(COPROCS& coprocs,
             warnings.push_back(buf);
             return;
         }
-        switch (attribs.target) {
+        switch ((int)attribs.target) {
         case CAL_TARGET_600:
             gpu_name="ATI Radeon HD 2900 (RV600)";
             break;
@@ -1049,7 +1049,7 @@ void COPROC_ATI::description(char* buf) {
 void fake_ati(COPROCS& coprocs, int count) {
     COPROC_ATI* cc = new COPROC_ATI;
     strcpy(cc->type, "ATI");
-    strcpy(cc->version, "1.2.3");
+    strcpy(cc->version, "1.4.3");
     cc->count = count;
     cc->attribs.numberOfSIMD = 32;
     cc->attribs.wavefrontSize = 32;