diff --git a/build.xml b/build.xml
index c2158205..61cb4434 100644
--- a/build.xml
+++ b/build.xml
@@ -98,7 +98,7 @@
         <exclude name="com/samskivert/util/**" unless="build.util"/>
         <exclude name="com/samskivert/velocity/**" unless="build.velocity"/>
         <exclude name="com/samskivert/xml/**" unless="build.xml"/>
-        <exclude name="com/samskivert/**/tests/**" unless="build.tests"/>
+        <exclude name="com/samskivert/**/tests/**"/>
       </packageset>
       <bottom>Copyright &#169; 2000-${year} ${copyright.holder}. All Rights Reserved.</bottom>
       <classpath refid="classpath"/>
diff --git a/src/java/com/samskivert/servlet/SiteIdentifier.java b/src/java/com/samskivert/servlet/SiteIdentifier.java
index e02ae4cf..35996a36 100644
--- a/src/java/com/samskivert/servlet/SiteIdentifier.java
+++ b/src/java/com/samskivert/servlet/SiteIdentifier.java
@@ -41,8 +41,7 @@ public interface SiteIdentifier
     /**
      * Returns the unique identifier for the site on which this request originated. That may be
      * divined by looking at the server name, or perhaps a request parameter, or part of the path
-     * info. The mechanism (or mechanisms) are up to the implementation. Note: the implementation
-     * must honor the {@link #SITE_ID_OVERRIDE_KEY} request attribute.
+     * info. The mechanism (or mechanisms) are up to the implementation.
      *
      * @param req the http servlet request the site for which we are trying to identify.
      *
diff --git a/src/java/com/samskivert/util/IntIntMap.java b/src/java/com/samskivert/util/IntIntMap.java
index b96b59eb..3a112147 100644
--- a/src/java/com/samskivert/util/IntIntMap.java
+++ b/src/java/com/samskivert/util/IntIntMap.java
@@ -159,7 +159,7 @@ public class IntIntMap
     /**
      * Returns true if this map contains a mapping for the specified key.
      *
-     * @Deprecated use {@link #containsKey}.
+     * @deprecated use {@link #containsKey}.
      */
     public boolean contains (int key)
     {
diff --git a/src/java/com/samskivert/util/tests/ThrottleTest.java b/src/java/com/samskivert/util/tests/ThrottleTest.java
index 5373aa68..6d857391 100644
--- a/src/java/com/samskivert/util/tests/ThrottleTest.java
+++ b/src/java/com/samskivert/util/tests/ThrottleTest.java
@@ -30,6 +30,24 @@ import com.samskivert.util.Throttle;
  */
 public class ThrottleTest extends TestCase
 {
+    public static class TestThrottle extends Throttle
+    {
+        public TestThrottle (int maxOps, long period)
+        {
+            super(maxOps, period);
+        }
+
+        public String opsToString ()
+        {
+            String hist = String.valueOf(_ops[_lastOp]);
+            for (int ii = 1; ii < _ops.length; ++ii) {
+                long tn = _ops[(_lastOp + ii) % _ops.length];
+                hist += ", " + String.valueOf(tn);
+            }
+            return hist;
+        }
+    }
+
     public static Test suite ()
     {
         return new ThrottleTest();
@@ -56,10 +74,6 @@ public class ThrottleTest extends TestCase
         testUpdate(8);
     }
 
-    /**
-     * Calls the {@link VariableThrottle#updateOpLimit} function a few times, interspersed with
-     * calls to add operations. Prints the operations contained in the throttle after each change.
-     */
     protected void testUpdate (int opCount)
     {
         // set up a throttle for 5 ops per millisecond
@@ -84,25 +98,4 @@ public class ThrottleTest extends TestCase
         throttle.reinit(10, 1);
         System.out.println("    " + throttle.opsToString());
     }
-
-    /**
-     * Constructs a string representation of all operation time stamps, starting from the oldest.
-     */
-    public static class TestThrottle extends Throttle
-    {
-        public TestThrottle (int maxOps, long period)
-        {
-            super(maxOps, period);
-        }
-
-        public String opsToString ()
-        {
-            String hist = String.valueOf(_ops[_lastOp]);
-            for (int ii = 1; ii < _ops.length; ++ii) {
-                long tn = _ops[(_lastOp + ii) % _ops.length];
-                hist += ", " + String.valueOf(tn);
-            }
-            return hist;
-        }
-    }
 }
diff --git a/src/java/com/samskivert/velocity/DispatcherServlet.java b/src/java/com/samskivert/velocity/DispatcherServlet.java
index 6383b324..f299ac4d 100644
--- a/src/java/com/samskivert/velocity/DispatcherServlet.java
+++ b/src/java/com/samskivert/velocity/DispatcherServlet.java
@@ -464,7 +464,7 @@ public class DispatcherServlet extends HttpServlet
     }
 
     /**
-     * Sets the content type of the response, defaulting to {@link #defaultContentType} if not
+     * Sets the content type of the response, defaulting to {@link #_defaultContentType} if not
      * overriden. Delegates to {@link #chooseCharacterEncoding(HttpServletRequest)} to select the
      * appropriate character encoding.
      */
@@ -522,7 +522,7 @@ public class DispatcherServlet extends HttpServlet
      * Merges the template with the context.
      *
      * @param template template object returned by the {@link #handleRequest} method.
-     * @param context context created by the {@link #createContext} method.
+     * @param context the context for this request.
      */
     protected void mergeTemplate (Template template, InvocationContext context)
         throws ResourceNotFoundException, ParseErrorException, MethodInvocationException,