diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java
index 4d47dda07d..fcff959c14 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java
@@ -36,7 +36,7 @@ public class PollingDispatcher implements SchedulableTask, SubscribableSource {
 
 	public final static int MAX_MESSAGES_UNBOUNDED = -1;
 
-	public final static long DEFAULT_RECEIVE_TIMEOUT = 5000;
+	public final static long DEFAULT_RECEIVE_TIMEOUT = -1;
 
 
 	private final Log logger = LogFactory.getLog(this.getClass());
@@ -80,8 +80,8 @@ public class PollingDispatcher implements SchedulableTask, SubscribableSource {
 	 * Note that this value will only be applicable if the source is an instance
 	 * of {@link BlockingSource}.
 	 * <p/>
-	 * A negative value indicates that receive calls should block indefinitely.
-	 * The default value is 5000 (5 seconds).
+	 * A negative value indicates that receive calls should block indefinitely,
+	 * and that is the default behavior.
 	 */
 	public void setReceiveTimeout(long receiveTimeout) {
 		this.messageExchangeTemplate.setReceiveTimeout(receiveTimeout);
@@ -90,7 +90,7 @@ public class PollingDispatcher implements SchedulableTask, SubscribableSource {
 	/**
 	 * Specify the timeout to use when sending to a target (in milliseconds).
 	 * Note that this value will only be applicable if the target is an instance
-	 * of {@link BlockingTarget}. The default value is 0.
+	 * of {@link BlockingTarget}.
 	 */
 	public void setSendTimeout(long sendTimeout) {
 		this.dispatcher.setTimeout(sendTimeout);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java
index d478ceedc6..46b6cfddde 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java
@@ -124,9 +124,6 @@ public class RouterMessageHandlerAdapter extends AbstractMessageHandlerAdapter i
 			}
 			return false;
 		}
-		if (logger.isDebugEnabled()) {
-			logger.debug("sending message to channel '" + channelName + "'");
-		}
 		return this.sendMessage(message, channel);
 	}
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
index 2059ed410a..e104181840 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
-	<beans:bean class="org.springframework.integration.bus.DefaultMessageBus"/>
+	<beans:bean id="messageBus" class="org.springframework.integration.bus.DefaultMessageBus"/>
 
 	<queue-channel id="testChannel" capacity="50"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
index ba32d5fe0f..07d0de0ac0 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
 
-	<beans:bean class="org.springframework.integration.bus.DefaultMessageBus"/>
+	<beans:bean id="messageBus" class="org.springframework.integration.bus.DefaultMessageBus"/>
 
 	<queue-channel id="testChannel" capacity="50"/>