diff --git a/core/src/main/java/org/springframework/ws/soap/SoapMessageDispatcher.java b/core/src/main/java/org/springframework/ws/soap/SoapMessageDispatcher.java
index 7d8df9ae..3f6cf6e7 100644
--- a/core/src/main/java/org/springframework/ws/soap/SoapMessageDispatcher.java
+++ b/core/src/main/java/org/springframework/ws/soap/SoapMessageDispatcher.java
@@ -103,7 +103,7 @@ public class SoapMessageDispatcher extends MessageDispatcher {
             String[] roles = getRoles(mappedEndpoint, soapRequest.getVersion());
             if (logger.isDebugEnabled()) {
                 logger.debug("Handling MustUnderstand headers for actors/roles [" +
-                        StringUtils.arrayToCommaDelimitedString(roles));
+                        StringUtils.arrayToCommaDelimitedString(roles) + "]");
             }
             for (int i = 0; i < roles.length; i++) {
                 if (!handleRequestForRole(mappedEndpoint, messageContext, roles[i])) {
diff --git a/samples/airline/src/main/webapp/WEB-INF/airline-servlet.xml b/samples/airline/src/main/webapp/WEB-INF/airline-servlet.xml
index 2717623b..c312b673 100644
--- a/samples/airline/src/main/webapp/WEB-INF/airline-servlet.xml
+++ b/samples/airline/src/main/webapp/WEB-INF/airline-servlet.xml
@@ -9,10 +9,10 @@
             supports MessageEndpoints instances as handlers.
             It uses a SAAJ to construct SoapMessageContexts (and SoapMessages).
         </description>
-        <property name="messageContextFactory" ref="messageContextFactory"/>
+        <property name="messageFactory" ref="messageFactory"/>
     </bean>
 
-    <bean id="messageContextFactory" class="org.springframework.ws.soap.saaj.SaajSoapMessageContextFactory"/>
+    <bean id="messageFactory" class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory"/>
 
     <bean id="wsdlDefinitionHandlerAdapter" class="org.springframework.ws.transport.http.WsdlDefinitionHandlerAdapter">
         <description>
diff --git a/samples/echo/client/saaj/build.xml b/samples/echo/client/saaj/build.xml
index e4cd5cfb..2cabefd0 100644
--- a/samples/echo/client/saaj/build.xml
+++ b/samples/echo/client/saaj/build.xml
@@ -21,7 +21,6 @@
 
     <target name="echo" depends="build">
         <java classname="org.springframework.ws.samples.echo.client.saaj.EchoClient" fork="true" failonerror="true">
-            <arg value="http://localhost:7001/echo/services"/>
             <classpath>
                 <pathelement location="${bin.dir}"/>
                 <pathelement location="lib/saaj-api.jar"/>