diff --git a/_autosetup b/_autosetup
index 79c6c0f3a7..696f0c79a3 100755
--- a/_autosetup
+++ b/_autosetup
@@ -128,7 +128,6 @@ echo "$cmdline"
 if eval $cmdline; then
     echo "Done, now run ./configure"
     echo " ./configure -C                         to enable caching"
-    echo " ./configure --enable-maintainer-mode   to enable maintainer dependencies"
     exit 0
 else
     echo "Something failed .... please check error-message and re-run when fixed."
diff --git a/checkin_notes b/checkin_notes
index 48a6f72a35..e56ff70b2e 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3496,3 +3496,18 @@ Reinhard May 1 2008
    features by default
 
    configure.ac
+
+David  May 1 2008
+    - scheduler: matchmaking scheduler now works;
+        uncomment MATCHMAKER to enable it.
+        More testing needed.
+    - client (unix): avoid crash if LD_LIBRARY_PATH not set
+
+    _autosetup
+    client/
+        cs_cmdline.C
+    lib/
+        gui_rpc_client_print.C
+        coproc.C
+    sched/
+        sched_send.C
diff --git a/client/cs_cmdline.C b/client/cs_cmdline.C
index 649333f478..90fc24999a 100644
--- a/client/cs_cmdline.C
+++ b/client/cs_cmdline.C
@@ -37,8 +37,8 @@
 static void print_options(char* prog) {
     printf(
         "The command-line options for %s are intended for debugging.\n"
-        "The recommended command-line interface is a separate program,'boinc_cmd'.\n"
-        "Run boinc_cmd in the same current as %s.\n"
+        "The recommended command-line interface is a separate program,'boinccmd'.\n"
+        "Run boinccmd in the same current as %s.\n"
         "\n"
         "Usage: %s [options]\n"
         "    --help                          show options\n"
diff --git a/lib/coproc.C b/lib/coproc.C
index a801fd358a..2860aa1ef9 100644
--- a/lib/coproc.C
+++ b/lib/coproc.C
@@ -132,10 +132,14 @@ void COPROC_CUDA::get(COPROCS& coprocs) {
     // Leave it there, shouldn't hurt.
     //
     char* p = getenv("LD_LIBRARY_PATH");
-    if (!strstr(p, "/usr/local/cuda/lib")) {
-        char libpath[8192];
-        sprintf(libpath, "%s:/usr/local/cuda/lib", p);
-        setenv("LD_LIBRARY_PATH", libpath, 1);
+    if (p) {
+        if (!strstr(p, "/usr/local/cuda/lib")) {
+            char libpath[8192];
+            sprintf(libpath, "%s:/usr/local/cuda/lib", p);
+            setenv("LD_LIBRARY_PATH", libpath, 1);
+        }
+    } else {
+        setenv("LD_LIBRARY_PATH", "/usr/local/cuda/lib", 1);
     }
 
    void *cudalib = dlopen ("libcudart.so", RTLD_NOW );
diff --git a/lib/gui_rpc_client_print.C b/lib/gui_rpc_client_print.C
index 4fd7850845..2c36ff1e50 100644
--- a/lib/gui_rpc_client_print.C
+++ b/lib/gui_rpc_client_print.C
@@ -18,7 +18,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 // This file is code to print (in ASCII) the stuff returned by GUI RPC.
-// Used only by boinc_cmd.
+// Used only by boinccmd.
 
 #if defined(_WIN32) && !defined(__STDWX_H__) && !defined(_BOINC_WIN_) && !defined(_AFX_STDAFX_H_)
 #include "boinc_win.h"
diff --git a/sched/sched_send.C b/sched/sched_send.C
index cba784b096..69c69e105b 100644
--- a/sched/sched_send.C
+++ b/sched/sched_send.C
@@ -1378,13 +1378,13 @@ void JOB::get_score(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) {
 
     WU_RESULT& wu_result = ssp->wu_results[index];
     wu = wu_result.workunit;
+    app = ssp->lookup_app(wu.appid);
 
     score = 0;
 
     // Find the app and app_version for the client's platform.
     //
     if (anonymous(sreq.platforms.list[0])) {
-        app = ssp->lookup_app(wu.appid);
         found = sreq.has_version(*app);
         if (!found) return;
         bavp = NULL;