diff --git a/client/app.h b/client/app.h
index 4327e65e74..e6e56c0e1a 100644
--- a/client/app.h
+++ b/client/app.h
@@ -48,7 +48,7 @@ class CLIENT_STATE;
 class ACTIVE_TASK {
 public:
 #ifdef _WIN32
-    HANDLE pid_handle;
+    HANDLE pid_handle,thread_handle;
 #endif
     RESULT* result;
     WORKUNIT* wup;
diff --git a/client/client_types.C b/client/client_types.C
index 16eed531b6..fe6faf5e77 100644
--- a/client/client_types.C
+++ b/client/client_types.C
@@ -110,12 +110,12 @@ int PROJECT::parse_state(FILE* in) {
         else if (parse_str(buf, "<user_name>", user_name, sizeof(user_name))) continue;
         else if (parse_double(buf, "<user_total_credit>", user_total_credit)) continue;
         else if (parse_double(buf, "<user_expavg_credit>", user_expavg_credit)) continue;
-	else if (parse_int(buf, "<user_create_time>", (int)user_create_time)) continue;
+	else if (parse_int(buf, "<user_create_time>", (int &)user_create_time)) continue;
         else if (parse_int(buf, "<rpc_seqno>", rpc_seqno)) continue;
         else if (parse_int(buf, "<hostid>", hostid)) continue;
 	else if (parse_double(buf, "<host_total_credit>", host_total_credit)) continue;
         else if (parse_double(buf, "<host_expavg_credit>", host_expavg_credit)) continue;
-        else if (parse_int(buf, "<host_create_time>", (int)host_create_time)) continue;
+        else if (parse_int(buf, "<host_create_time>", (int &)host_create_time)) continue;
         else if (parse_double(buf, "<exp_avg_cpu>", exp_avg_cpu)) continue;
         else if (parse_int(buf, "<exp_avg_mod_time>", exp_avg_mod_time)) continue;
         else if (match_tag(buf, "<code_sign_key>")) {
diff --git a/client/scheduler_op.C b/client/scheduler_op.C
index c3521b5f75..dadcea3eb1 100644
--- a/client/scheduler_op.C
+++ b/client/scheduler_op.C
@@ -410,7 +410,7 @@ int SCHEDULER_REPLY::parse(FILE* in) {
             continue;
         } else if (parse_double(buf, "<user_expavg_credit>", user_expavg_credit)) {
             continue;
-	} else if (parse_int(buf, "<user_create_time>", (int)user_create_time)) {
+	} else if (parse_int(buf, "<user_create_time>", (int &)user_create_time)) {
 	    continue;
         } else if (parse_int(buf, "<hostid>", hostid)) {
             continue;
@@ -418,7 +418,7 @@ int SCHEDULER_REPLY::parse(FILE* in) {
 	    continue;
 	} else if (parse_double(buf, "<host_expavg_credit>", host_expavg_credit)) {
 	    continue;
-	} else if (parse_int(buf, "<host_create_time>", (int)host_create_time)) {
+	} else if (parse_int(buf, "<host_create_time>", (int &)host_create_time)) {
 	    continue;
         } else if (parse_int(buf, "<request_delay>", request_delay)) {
             continue;
diff --git a/client/test_net_xfer.C b/client/test_net_xfer.C
index 372548a4c1..db807d6631 100644
--- a/client/test_net_xfer.C
+++ b/client/test_net_xfer.C
@@ -94,7 +94,9 @@ int main() {
         boinc_sleep(1);
     }
     nxs.remove(nxp);
-    if (nxp->file) fclose(nxp->file);
+    if (nxp->file) {
+		fclose(nxp->file);
+	}
 
     return 0;
 }