diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java
index 6b42ce7ed..09c32c1d7 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java
@@ -63,7 +63,7 @@ public class JpaCountQueryCreator extends JpaQueryCreator {
      * javax.persistence.criteria.CriteriaBuilder)
      */
     @Override
-    protected CriteriaQuery<Object> finalize(Predicate predicate, Sort sort,
+    protected CriteriaQuery<Object> complete(Predicate predicate, Sort sort,
             CriteriaQuery<Object> query, CriteriaBuilder builder) {
 
         return query.select(builder.count(query.from(domainClass)));
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java
index 6574a6cff..810615f3b 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java
@@ -114,14 +114,14 @@ public class JpaQueryCreator extends
     /**
      * Finalizes the given {@link Predicate} and applies the given sort.
      * Delegates to
-     * {@link #finalize(Predicate, Sort, CriteriaQuery, CriteriaBuilder)} and
+     * {@link #complete(Predicate, Sort, CriteriaQuery, CriteriaBuilder)} and
      * hands it the current {@link CriteriaQuery} and {@link CriteriaBuilder}.
      */
     @Override
-    protected final CriteriaQuery<Object> finalize(Predicate predicate,
+    protected final CriteriaQuery<Object> complete(Predicate predicate,
             Sort sort) {
 
-        return finalize(predicate, sort, query, builder);
+        return complete(predicate, sort, query, builder);
     }
 
 
@@ -135,7 +135,7 @@ public class JpaQueryCreator extends
      * @param builder
      * @return
      */
-    protected CriteriaQuery<Object> finalize(Predicate predicate, Sort sort,
+    protected CriteriaQuery<Object> complete(Predicate predicate, Sort sort,
             CriteriaQuery<Object> query, CriteriaBuilder builder) {
 
         return this.query.select(root).where(predicate)
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java
index c39d29ca1..818de9997 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java
@@ -30,7 +30,14 @@ import org.springframework.data.repository.query.RepositoryQuery;
  * 
  * @author Oliver Gierke
  */
-public class JpaQueryLookupStrategy {
+public final class JpaQueryLookupStrategy {
+
+    /**
+     * Private constructor to prevent instantiation.
+     */
+    private JpaQueryLookupStrategy() {
+
+    }
 
     /**
      * Base class for {@link QueryLookupStrategy} implementations that need
@@ -38,7 +45,7 @@ public class JpaQueryLookupStrategy {
      * 
      * @author Oliver Gierke
      */
-    private static abstract class AbstractQueryLookupStrategy implements
+    private abstract static class AbstractQueryLookupStrategy implements
             QueryLookupStrategy {
 
         private final EntityManager em;
@@ -195,7 +202,7 @@ public class JpaQueryLookupStrategy {
             return new CreateIfNotFoundQueryLookupStrategy(em, extractor);
         default:
             throw new IllegalArgumentException(String.format(
-                    "Unsupported query lookup strategy %!", key));
+                    "Unsupported query lookup strategy %s!", key));
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java
index c829753ca..5e2503131 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java
@@ -113,7 +113,7 @@ public class JpaQueryMethod extends QueryMethod {
      * 
      * @return
      */
-    boolean isModifyingQuery() {
+    final boolean isModifyingQuery() {
 
         return null != AnnotationUtils.findAnnotation(method, Modifying.class);
     }
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinder.java b/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinder.java
index 073fb9432..1ff44e905 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinder.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinder.java
@@ -51,7 +51,7 @@ public class ParameterBinder {
                 "Invalid number of parameters given!");
 
         this.parameters = parameters;
-        this.values = values;
+        this.values = values.clone();
     }
 
 
diff --git a/src/main/java/org/springframework/data/jpa/repository/utils/JpaClassUtils.java b/src/main/java/org/springframework/data/jpa/repository/utils/JpaClassUtils.java
index c18b319cc..ee2564bf7 100644
--- a/src/main/java/org/springframework/data/jpa/repository/utils/JpaClassUtils.java
+++ b/src/main/java/org/springframework/data/jpa/repository/utils/JpaClassUtils.java
@@ -28,6 +28,14 @@ import org.springframework.util.StringUtils;
  */
 public abstract class JpaClassUtils {
 
+    /**
+     * Private constructor to prevent instantiation.
+     */
+    private JpaClassUtils() {
+
+    }
+
+
     /**
      * Returns whether the given {@link EntityManager} is of the given type.
      *