diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java b/querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java
index c7fdfc402..bce2283d7 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java
@@ -15,8 +15,8 @@ package com.querydsl.core.support;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
+import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 import com.querydsl.core.*;
 import com.querydsl.core.types.*;
@@ -71,7 +71,7 @@ public class ReplaceVisitor<C> implements Visitor<Expression<?>, C> {
             if (element instanceof Expression<?>) {
                 element = ((Expression) element).accept(this, context);
             }
-            if (parent.equals(metadata.getParent()) && Objects.equals(element, metadata.getElement())) {
+            if (parent.equals(metadata.getParent()) && Objects.equal(element, metadata.getElement())) {
                 return expr;
             } else {
                 metadata = new PathMetadata(parent, element, metadata.getPathType());
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/support/JaveSE7SQLExceptionWrapper.java b/querydsl-sql/src/main/java/com/querydsl/sql/support/JavaSE7SQLExceptionWrapper.java
similarity index 96%
rename from querydsl-sql/src/main/java/com/querydsl/sql/support/JaveSE7SQLExceptionWrapper.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/support/JavaSE7SQLExceptionWrapper.java
index 79a55f2a3..c1e2de175 100644
--- a/querydsl-sql/src/main/java/com/querydsl/sql/support/JaveSE7SQLExceptionWrapper.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/support/JavaSE7SQLExceptionWrapper.java
@@ -23,7 +23,7 @@ import com.querydsl.core.QueryException;
  *
  * @author Shredder121
  */
-class JaveSE7SQLExceptionWrapper extends SQLExceptionWrapper {
+class JavaSE7SQLExceptionWrapper extends SQLExceptionWrapper {
 
     @Override
     public RuntimeException wrap(SQLException exception) {
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java b/querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java
index 219f45c34..86b57aa4e 100644
--- a/querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java
@@ -35,7 +35,7 @@ public abstract class SQLExceptionWrapper {
         double javaVersion
                 = Double.parseDouble(JAVA_SPECIFICATION_VERSION.value());
         if (javaVersion > 1.6) {
-            INSTANCE = new JaveSE7SQLExceptionWrapper();
+            INSTANCE = new JavaSE7SQLExceptionWrapper();
         } else {
             INSTANCE = new JavaSE6SQLExceptionWrapper();
         }