diff --git a/checkin_notes b/checkin_notes
index 8902f037f0..f1fc557dfa 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -27053,4 +27053,17 @@ Bruce 11 April 2005
         sched_locality.C
         file_upload_handler.C
 
+David  12 April 2005
+    - The test script test_uc.py didn't work.  There were 2 problems:
+        1) the core client's logic for checking an account filename
+            was too strict.  It required a dot in the hostname,
+            which wasn't present here ("localhost")
+        2) the Python code for signing executables needed to look
+            both in bin/ (for "upgrade") and ../tools/ (for test)
+            for the sign_executable program
 
+    client/
+        file_names.C
+    py/Boinc/
+        setup_project.py
+        tools.py
diff --git a/client/file_names.C b/client/file_names.C
index f896ae128c..b3746de4af 100644
--- a/client/file_names.C
+++ b/client/file_names.C
@@ -153,13 +153,8 @@ bool is_account_file(const char* filename) {
     const char* p, *q;
     p = strstr(filename, "account_");
     if (p != filename) return false;
+
     q = filename + strlen("account_");
-
-    p = strstr(q, ".");
-    if (!p) return bad_account_filename(filename);
-    if (p == q) return bad_account_filename(filename);
-
-    q = p+1;
     p = strstr(q, ".xml");
     if (!p) return bad_account_filename(filename);
     if (p == q) return bad_account_filename(filename);
diff --git a/doc/download_other.php b/doc/download_other.php
index d1cf062f7d..ba9bdd32df 100644
--- a/doc/download_other.php
+++ b/doc/download_other.php
@@ -22,7 +22,10 @@ list_heading_array(array(
 ));
 list_item_array(array(
     "<a href=http://www.lb.shuttle.de/apastron/boincDown.shtml>Stefan Urbat</a>",
-    "Solaris 10 AMD64 (Opteron)<br> GNU/Linux AMD64 (Opteron)<br> Mac OS X 10.3 on PowerPC 7450 and later",
+    "Solaris 10 AMD64 (Opteron) and x86
+    <br> GNU/Linux AMD64 (Opteron)
+    <br> GNU/Linux PowerPC,
+    <br> Mac OS X 10.3 on PowerPC 7450 and later",
     "BOINC core client, SETI@home"
 ));
 
diff --git a/py/Boinc/setup_project.py b/py/Boinc/setup_project.py
index 38c700f063..c6b6593db9 100644
--- a/py/Boinc/setup_project.py
+++ b/py/Boinc/setup_project.py
@@ -459,11 +459,11 @@ class Project:
         install(srcdir('html/project.sample/cache_parameters.inc'),
             self.dir('html/project/cache_parameters.inc'))
         install(srcdir('html/user', 'forum_sample_index.php'),
-            dir('html/user', 'forum_index.php'))
+            self.dir('html/user/forum_index.php'))
         install(srcdir('html/user', 'sample_rss_main.php'),
-            dir('html/user', 'rss_main.php'))
+            self.dir('html/user/rss_main.php'))
         install(srcdir('html/user', 'sample_status.php'),
-            dir('html/user', 'status.php'))
+            self.dir('html/user/status.php'))
 
 
         my_symlink(self.config.config.download_dir, self.dir('html', 'user', 'download'))
diff --git a/py/Boinc/tools.py b/py/Boinc/tools.py
index 7d1670b269..eb65e202e2 100644
--- a/py/Boinc/tools.py
+++ b/py/Boinc/tools.py
@@ -74,10 +74,16 @@ def sign_executable(executable_path, quiet=False):
         query_sign_executable(executable_path)
         print 'Signing', executable_path
     code_sign_key = os.path.join(config.config.key_dir, 'code_sign_private')
+
+    # sign_executable could be in bin/ or ../tool/, depending on
+    # whether this is a test or an upgrade
+
     sign_executable_path = 'bin/sign_executable'
     if not os.path.exists(sign_executable_path):
-        print os.getcwd()
-        raise SystemExit("sign_executable not found! did you `make' it?")
+        sign_executable_path = '../tools/sign_executable'
+        if not os.path.exists(sign_executable_path):
+            print os.getcwd()
+            raise SystemExit("sign_executable not found! did you `make' it?")
     signature_text = os.popen('%s %s %s'%(sign_executable_path,
         executable_path,code_sign_key)).read()
     if not signature_text: