diff --git a/core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java b/core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java
index db7f0c57..9d48bfbc 100644
--- a/core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java
+++ b/core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java
@@ -17,6 +17,7 @@
 package org.springframework.ws.transport;
 
 import java.io.IOException;
+import java.net.URI;
 
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.WebServiceMessageFactory;
@@ -28,7 +29,7 @@ import org.springframework.ws.WebServiceMessageFactory;
  * A <code>WebServiceConnection</code> can be obtained using a {@link WebServiceMessageSender}.
  *
  * @author Arjen Poutsma
- * @see WebServiceMessageSender#createConnection(String)
+ * @see WebServiceMessageSender#createConnection(URI)
  * @since 1.0.0
  */
 public interface WebServiceConnection {
diff --git a/core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java b/core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java
index d2c62488..17106218 100644
--- a/core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java
+++ b/core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java
@@ -18,8 +18,6 @@ package org.springframework.ws.transport.support;
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 import org.springframework.ws.FaultAwareWebServiceMessage;
@@ -36,6 +34,9 @@ import org.springframework.ws.transport.context.DefaultTransportContext;
 import org.springframework.ws.transport.context.TransportContext;
 import org.springframework.ws.transport.context.TransportContextHolder;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * Convenience base class for server-side transport objects. Contains a {@link WebServiceMessageFactory}, and has
  * methods for handling incoming {@link WebServiceConnection}s.
@@ -70,11 +71,10 @@ public abstract class WebServiceMessageReceiverObjectSupport implements Initiali
      * message from it, passing it to the {@link WebServiceMessageReceiver#receive(MessageContext) receiver}, and {@link
      * WebServiceConnection#send(WebServiceMessage) sending} the response (if any).
      * <p/>
-     * Stores the given connection in the transport context.
+     * Stores the given connection in the {@link TransportContext}.
      *
      * @param connection the incoming connection
      * @param receiver   the handler of the message, typically a {@link org.springframework.ws.server.MessageDispatcher}
-     * @see org.springframework.ws.transport.context.TransportContext
      */
     protected final void handleConnection(WebServiceConnection connection, WebServiceMessageReceiver receiver)
             throws Exception {