diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchListenerFactoryHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchListenerFactoryHelper.java
index 2a9c8b0b8..2bb78e1e8 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchListenerFactoryHelper.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchListenerFactoryHelper.java
@@ -49,7 +49,7 @@ abstract class BatchListenerFactoryHelper {
 	 * @param itemReader
 	 * @param listeners
 	 */
-	public static ItemReader getItemReader(ItemReader itemReader, StepListener[] listeners) {
+	public static ItemReader<?> getItemReader(ItemReader<?> itemReader, StepListener[] listeners) {
 
 		final CompositeItemReadListener multicaster = new CompositeItemReadListener();
 
@@ -82,7 +82,7 @@ abstract class BatchListenerFactoryHelper {
 	 * @param itemWriter
 	 * @param listeners
 	 */
-	public static ItemWriter getItemWriter(ItemWriter itemWriter, StepListener[] listeners) {
+	public static ItemWriter<?> getItemWriter(ItemWriter<?> itemWriter, StepListener[] listeners) {
 		final CompositeItemWriteListener multicaster = new CompositeItemWriteListener();
 
 		for (int i = 0; i < listeners.length; i++) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletAdapter.java
index 3a3ec470f..616b2816b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletAdapter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletAdapter.java
@@ -30,7 +30,7 @@ import org.springframework.batch.repeat.ExitStatus;
  * @author Dave Syer
  * 
  */
-public class TaskletAdapter extends AbstractMethodInvokingDelegator implements Tasklet {
+public class TaskletAdapter extends AbstractMethodInvokingDelegator<Object> implements Tasklet {
 
 	/**
 	 * Delegate execution to the target object and translate the return value to