diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURIParseTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURIParseTest.java
index 189e09fe8ea..f2f1d26115d 100644
--- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURIParseTest.java
+++ b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURIParseTest.java
@@ -71,7 +71,7 @@ public class HttpURIParseTest
         {"/path/info;param#fragment",null,null,null,"/path/info;param","param",null,"fragment"},
         {"/path/info;param?query",null,null,null,"/path/info;param","param","query",null},
         {"/path/info;param?query#fragment",null,null,null,"/path/info;param","param","query","fragment"},
-        // FIXME: {"/path/info;a=b/foo;c=d",null,null,null,"/data/info;a=b/foo;c=d","foo=bar1",null,null},
+        {"/path/info;a=b/foo;c=d",null,null,null,"/path/info;a=b/foo;c=d","c=d",null,null}, // TODO #405
 
         // Protocol Less (aka scheme-less) URIs
         {"//host/path/info",null,"host",null,"/path/info",null,null,null},
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
index 3659f9ed9e2..cf5735e3d2c 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -2182,8 +2182,8 @@ public class Request implements HttpServletRequest
 
     /* ------------------------------------------------------------ */
     /**
-     * @param sessionManager
-     *            The sessionManager to set.
+     * @param sessionHandler
+     *            The SessionHandler to set.
      */
     public void setSessionHandler(SessionHandler sessionHandler)
     {
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionCacheFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionCacheFactory.java
index c04046907be..d8acb5bdfc9 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionCacheFactory.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionCacheFactory.java
@@ -65,7 +65,7 @@ public class DefaultSessionCacheFactory implements SessionCacheFactory
     }
 
     /** 
-     * @see org.eclipse.jetty.server.session.SessionCacheFactory#getSessionStore(org.eclipse.jetty.server.session.SessionHandler)
+     * @see org.eclipse.jetty.server.session.SessionCacheFactory#getSessionCache(SessionHandler) 
      */
     @Override
     public SessionCache getSessionCache (SessionHandler handler)
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java
index 1d1bff34d37..f54def3911f 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java
@@ -104,7 +104,7 @@ public class DefaultSessionIdManager extends AbstractLifeCycle implements Sessio
     
     /* ------------------------------------------------------------ */
     /**
-     * @param inspector inspector of sessions
+     * @param houseKeeper the housekeeper
      */
     public void setSessionHouseKeeper (HouseKeeper houseKeeper)
     {
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionStoreFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionStoreFactory.java
index 136f5b9f0fd..72efad5be63 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionStoreFactory.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionStoreFactory.java
@@ -69,7 +69,7 @@ public class FileSessionStoreFactory extends AbstractSessionStoreFactory
 
     
     /** 
-     * @see org.eclipse.jetty.server.session.SessionStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler)
+     * @see org.eclipse.jetty.server.session.SessionStoreFactory#getSessionStore(SessionHandler)
      */
     @Override
     public SessionStore getSessionStore(SessionHandler handler)
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionStoreFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionStoreFactory.java
index 83492ba0c31..d820a3167f9 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionStoreFactory.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionStoreFactory.java
@@ -82,7 +82,7 @@ public class JDBCSessionStoreFactory extends AbstractSessionStoreFactory
 
 
     /** 
-     * @see org.eclipse.jetty.server.session.SessionStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler)
+     * @see org.eclipse.jetty.server.session.SessionStoreFactory#getSessionStore(SessionHandler)
      */
     @Override
     public SessionStore getSessionStore(SessionHandler handler)
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java
index 093cb1f8ae2..1eeeece0361 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java
@@ -920,9 +920,6 @@ public class Session implements SessionHandler.SessionIf
     
     
     /* ------------------------------------------------------------- */
-    /** 
-     * @see org.eclipse.jetty.server.session.SessionManager.SessionIf#getSession()
-     */
     @Override
     public Session getSession()
     {
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
index 5b9f6b202d7..ed353b3916f 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
@@ -471,7 +471,7 @@ public class SessionHandler extends ScopedHandler
     /**
      * Returns the <code>HttpSession</code> with the given session id
      *
-     * @param id the session id
+     * @param extendedId the session id
      * @return the <code>HttpSession</code> with the corresponding id or null if no session with the given id exists
      */
     public HttpSession getHttpSession(String extendedId)
@@ -841,7 +841,7 @@ public class SessionHandler extends ScopedHandler
     /**
      * Sets the session id URL path parameter name.
      *
-     * @param parameterName the URL path parameter name for session id URL rewriting (null or "none" for no rewriting).
+     * @param param the URL path parameter name for session id URL rewriting (null or "none" for no rewriting).
      * @see #getSessionIdPathParameterName()
      * @see #getSessionIdPathParameterNamePrefix()
      */