diff --git a/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java b/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java
index 1be211f20..e00cd95e5 100755
--- a/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java
+++ b/src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java
@@ -60,7 +60,7 @@ public class AnnotationRevisionMetadata<N extends Number & Comparable<N>> implem
 			AnnotationDetectionFieldCallback revisionCallback = new AnnotationDetectionFieldCallback(
 					revisionTimeStampAnnotation);
 			ReflectionUtils.doWithFields(entity.getClass(), revisionCallback);
-			this.revisionDate = new DateTime(revisionCallback.getValue(entity));
+			this.revisionDate = new DateTime(revisionCallback.<Object> getValue(entity));
 		} else {
 			this.revisionDate = null;
 		}
diff --git a/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java b/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java
index f94d578a7..e96cb3e94 100644
--- a/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java
+++ b/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java
@@ -154,7 +154,6 @@ class ReflectionRepositoryInvoker implements RepositoryInvoker {
 	 * @see org.springframework.data.rest.core.invoke.RepositoryInvoker#invokeDelete(java.io.Serializable)
 	 */
 	@Override
-	@SuppressWarnings("unchecked")
 	public void invokeDelete(Serializable id) {
 
 		Assert.notNull(id, "Identifier must not be null!");
@@ -167,7 +166,7 @@ class ReflectionRepositoryInvoker implements RepositoryInvoker {
 		if (idTypes.contains(parameterType)) {
 			invoke(method, convertId(id));
 		} else {
-			invoke(method, invokeFindOne(id));
+			invoke(method, this.<Object> invokeFindOne(id));
 		}
 	}
 
diff --git a/src/test/java/org/springframework/data/repository/query/ResultProcessorUnitTests.java b/src/test/java/org/springframework/data/repository/query/ResultProcessorUnitTests.java
index 450172e87..09dc3809e 100644
--- a/src/test/java/org/springframework/data/repository/query/ResultProcessorUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/query/ResultProcessorUnitTests.java
@@ -221,6 +221,7 @@ public class ResultProcessorUnitTests {
 	 * @see DATACMNS-859
 	 */
 	@Test
+	@SuppressWarnings("unchecked")
 	public void supportsStreamAsReturnWrapper() throws Exception {
 
 		Stream<Sample> samples = Arrays.asList(new Sample("Dave", "Matthews")).stream();
@@ -228,7 +229,7 @@ public class ResultProcessorUnitTests {
 		Object result = getProcessor("findStreamProjection").processResult(samples);
 
 		assertThat(result, is(instanceOf(Stream.class)));
-		List<?> content = ((Stream<?>) result).collect(Collectors.toList());
+		List<Object> content = ((Stream<Object>) result).collect(Collectors.toList());
 
 		assertThat(content, is(not(empty())));
 		assertThat(content.get(0), is(instanceOf(SampleProjection.class)));