diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderIntegrationTests.java
index 668cf2dde..fbcc4f755 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderIntegrationTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderIntegrationTests.java
@@ -1,13 +1,13 @@
 package org.springframework.batch.item.database;
 
+import org.junit.runner.RunWith;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.database.support.IbatisKeyCollector;
 import org.springframework.batch.item.sample.Foo;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.orm.ibatis.SqlMapClientFactoryBean;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.ContextConfiguration;
-import org.junit.runner.RunWith;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.ibatis.sqlmap.client.SqlMapClient;
 
@@ -15,6 +15,8 @@ import com.ibatis.sqlmap.client.SqlMapClient;
  * Tests for {@link IbatisDrivingQueryItemReader}
  *
  * @author Robert Kasanicky
+ * 
+ * @deprecated
  */
 @SuppressWarnings("unchecked")
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java
index 2efe4caec..f8a47faf8 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java
@@ -58,7 +58,7 @@ public class StagingItemReader<T> extends JdbcDaoSupport implements ItemStream,
 
 	/**
 	 * 
-	 * @see org.springframework.batch.item.database.DrivingQueryItemReader#close(ExecutionContext)
+	 * @see org.springframework.batch.item.ItemStream#close(ExecutionContext)
 	 */
 	public void close(ExecutionContext executionContext) {
 		initialized = false;
@@ -70,7 +70,7 @@ public class StagingItemReader<T> extends JdbcDaoSupport implements ItemStream,
 
 	/**
 	 * 
-	 * @see org.springframework.batch.item.database.DrivingQueryItemReader#open(ExecutionContext)
+	 * @see org.springframework.batch.item.ItemStream#open(ExecutionContext)
 	 */
 	public void open(ExecutionContext executionContext) {
 		// Can be called from multiple threads because of lazy initialisation...