diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java
index a1fcc76f66..f9e21c83db 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractTargetEndpointParser.java
@@ -30,7 +30,6 @@ import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.endpoint.ConcurrencyPolicy;
-import org.springframework.integration.handler.DefaultMessageHandlerAdapter;
 import org.springframework.integration.scheduling.PollingSchedule;
 import org.springframework.integration.scheduling.Schedule;
 import org.springframework.integration.scheduling.Subscription;
@@ -111,7 +110,7 @@ public abstract class AbstractTargetEndpointParser extends AbstractSingleBeanDef
 		}
 		if (StringUtils.hasText(inputChannel)) {
 			RootBeanDefinition subscriptionDef = new RootBeanDefinition(Subscription.class);
-			subscriptionDef.getConstructorArgumentValues().addGenericArgumentValue(new RuntimeBeanReference(inputChannel));
+			subscriptionDef.getConstructorArgumentValues().addGenericArgumentValue(inputChannel);
 			if (schedule != null) {
 				subscriptionDef.getConstructorArgumentValues().addGenericArgumentValue(schedule);
 			}
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java b/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
index 43571af442..b251b32b6e 100644
--- a/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
+++ b/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
@@ -38,7 +38,6 @@ public class HelloWorldDemo {
 		MessageChannel outputChannel = channelRegistry.lookupChannel("outputChannel");
 		inputChannel.send(new StringMessage("World"));
 		System.out.println(outputChannel.receive().getPayload());
-		context.stop();
 	}
 
 }
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml b/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
index 7cedc46541..c491f8c3de 100644
--- a/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
+++ b/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
@@ -9,7 +9,7 @@
 
 	<message-bus auto-create-channels="true"/>
 
-     	<handler-endpoint input-channel="inputChannel"
+	<handler-endpoint input-channel="inputChannel"
 	          output-channel="outputChannel"
 	          handler="helloService"
 	          method="sayHello"/>