diff --git a/api/boinc_opencl.cpp b/api/boinc_opencl.cpp
index b7b4943af2..9bc11e5368 100644
--- a/api/boinc_opencl.cpp
+++ b/api/boinc_opencl.cpp
@@ -184,7 +184,7 @@ int boinc_get_opencl_ids(
 
 #ifdef _WIN32
     try {
-        retval = boinc_get_opencl_ids_aux(type, device_num, &ref);
+        retval = boinc_get_opencl_ids_aux(type, device_num, device, platform);
     }
     catch (...) {
         return ERR_SIGNAL_CATCH;
diff --git a/checkin_notes b/checkin_notes
index 3777dac624..47c6a9a2df 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5371,3 +5371,16 @@ David  31 Aug 2011
 
     api/
         boinc_opencl.cpp,h
+
+David  31 Aug 2011
+	- client: fix bugs related to white space around code signing keys
+	- win compile fixes
+
+	api/
+		boinc_opencl.cpp
+	client/
+		client_types.cpp
+		cs_scheduler.cpp
+		scheduler_op.cpp
+	win_build/
+		libboincapi_staticrt.vcproj
diff --git a/client/client_types.cpp b/client/client_types.cpp
index 4d5cef96ed..8b5b42ebf8 100644
--- a/client/client_types.cpp
+++ b/client/client_types.cpp
@@ -515,7 +515,7 @@ int PROJECT::write_state(MIOFILE& out, bool gui_rpc) {
         }
         if (strlen(code_sign_key)) {
             out.printf(
-                "    <code_sign_key>\n%s</code_sign_key>\n", code_sign_key
+                "    <code_sign_key>\n%s\n</code_sign_key>\n", code_sign_key
             );
         }
     }
diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp
index f2ef1925dc..68e95eb5d0 100644
--- a/client/cs_scheduler.cpp
+++ b/client/cs_scheduler.cpp
@@ -144,7 +144,7 @@ int CLIENT_STATE::make_scheduler_request(PROJECT* p) {
     write_platforms(p, mf);
 
     if (strlen(p->code_sign_key)) {
-        fprintf(f, "    <code_sign_key>\n%s</code_sign_key>\n", p->code_sign_key);
+        fprintf(f, "    <code_sign_key>\n%s\n</code_sign_key>\n", p->code_sign_key);
     }
 
     // send working prefs
diff --git a/client/scheduler_op.cpp b/client/scheduler_op.cpp
index 32fb8222a1..dcff5d8731 100644
--- a/client/scheduler_op.cpp
+++ b/client/scheduler_op.cpp
@@ -704,7 +704,6 @@ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
                 return retval;
             }
             project->gui_urls = "<gui_urls>\n"+foo+"</gui_urls>\n";
-            continue;
         } else if (xp.match_tag("code_sign_key")) {
             retval = dup_element_contents(
                 xp.f->f,
@@ -718,6 +717,7 @@ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
                 );
                 return ERR_XML_PARSE;
             }
+            strip_whitespace(code_sign_key);
         } else if (xp.match_tag("code_sign_key_signature")) {
             retval = dup_element_contents(
                 xp.f->f,
diff --git a/win_build/libboincapi_staticcrt.vcproj b/win_build/libboincapi_staticcrt.vcproj
index 0ef055bc44..3baa5bae6e 100644
--- a/win_build/libboincapi_staticcrt.vcproj
+++ b/win_build/libboincapi_staticcrt.vcproj
@@ -358,6 +358,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\api\boinc_opencl.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\lib\boinc_win.cpp"
 				>
@@ -452,6 +456,10 @@
 				RelativePath="..\api\boinc_api.h"
 				>
 			</File>
+			<File
+				RelativePath="..\api\boinc_opencl.h"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>