diff --git a/checkin_notes b/checkin_notes
index 8bc1670e84..b45d0bbd1f 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -484,3 +484,11 @@ David  15 Jan 2006
     html/
         user/
             team_lookup.php
+
+David  15 Jan 2006
+    - compile fixes for gcc4.0
+
+    client/
+        gui_rpc_server.C
+    lib/
+        network.C
diff --git a/client/gui_rpc_server.C b/client/gui_rpc_server.C
index 938385a59e..02e76ef8a6 100644
--- a/client/gui_rpc_server.C
+++ b/client/gui_rpc_server.C
@@ -281,7 +281,7 @@ void GUI_RPC_CONN_SET::got_select(FDSET_GROUP& fg) {
         }
 
         boinc_socklen_t addr_len = sizeof(addr);
-        sock = accept(lsock, (struct sockaddr*)&addr, &addr_len);
+        sock = accept(lsock, (struct sockaddr*)&addr, (socklen_t*)&addr_len);
         if (sock == -1) {
             return;
         }
diff --git a/doc/client_unix.php b/doc/client_unix.php
index b30561e04e..c1668bb9ce 100644
--- a/doc/client_unix.php
+++ b/doc/client_unix.php
@@ -72,7 +72,7 @@ list_item("-no_gui_rpc",
     "Don't allow GUI RPCs."
 );
 list_item("-daemon",
-    "Run as daemon (detach from controlling terminal; Linux only)
+    "Run as daemon (detach from controlling terminal; Linux only)"
 );
 list_end();
 echo "
diff --git a/doc/compound_app.php b/doc/compound_app.php
index adc5da20b9..e814e1c964 100644
--- a/doc/compound_app.php
+++ b/doc/compound_app.php
@@ -36,7 +36,7 @@ struct BOINC_OPTIONS {
 	int direct_process_action;
 };
 
-int boinc_init_options(BOINC_OPTIONS&);
+int boinc_init_options(BOINC_OPTIONS&);
 </pre>
 ";
 list_start();
diff --git a/doc/int_upload.php b/doc/int_upload.php
index 0be4196706..b3b418d02e 100644
--- a/doc/int_upload.php
+++ b/doc/int_upload.php
@@ -6,14 +6,14 @@ Long-running applications can upload particular output files
 before the result as a whole is finished.
 To initiate the upload of an output file, call
 <pre>
-   extern int boinc_upload_file(std::string& name);
+   extern int boinc_upload_file(std::string&amp; name);
 </pre>
 where 'name' is the logical name of the file.
 The application cannot modify the file after making this call.
 <p>
 To check on the status of a file being uploaded, call
 <pre>
-   extern int boinc_upload_status(std::string& name);
+   extern int boinc_upload_status(std::string&amp; name);
 </pre>
 This will return zero if the upload of the file is finished
 successfully.
diff --git a/doc/road_map.php b/doc/road_map.php
index fec9070765..9cac9fb848 100644
--- a/doc/road_map.php
+++ b/doc/road_map.php
@@ -54,7 +54,7 @@ list_item("tools",
 );
 list_item("zip",
     "Compression functions; not used by BOINC,
-    buy may be useful for applications."
+    but may be useful for applications."
 );
 list_end();
 page_tail();
diff --git a/doc/tools_work.php b/doc/tools_work.php
index 014f6b4513..52059ea3fe 100644
--- a/doc/tools_work.php
+++ b/doc/tools_work.php
@@ -293,7 +293,7 @@ their input files, their command-line arguments, or both.
 
 <p>
 For example, let's say you want to run a program
-one ten input files 'file0', 'file1', ..., 'file9'.
+on ten input files 'file0', 'file1', ..., 'file9'.
 You might modify the above program with the following code:
 <pre>
     char filename[256];
diff --git a/lib/network.C b/lib/network.C
index dd6aab337e..7fa3870f81 100644
--- a/lib/network.C
+++ b/lib/network.C
@@ -172,7 +172,7 @@ int get_socket_error(int fd) {
     socklen_t sinsz = sizeof(sin);
     n = getpeername(fd, (struct sockaddr *)&sin, &sinsz);
 #else
-    getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&n, &intsize);
+    getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&n, (socklen_t*)&intsize);
 #endif
     return n;
 }