diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/LongToTimestampConverter.java b/src/main/java/com/avaje/ebeaninternal/server/type/LongToTimestampConverter.java
index 6f308c516..b553d550c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/LongToTimestampConverter.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/LongToTimestampConverter.java
@@ -12,7 +12,7 @@ public class LongToTimestampConverter implements ScalarTypeConverter<Long, Times
 
   public Timestamp unwrapValue(Long beanType) {
 
-    return new Timestamp(beanType.longValue());
+    return new Timestamp(beanType);
   }
 
   public Long wrapValue(Timestamp scalarType) {
diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCore.java b/src/test/java/com/avaje/tests/compositekeys/TestCore.java
index 52182a636..6b3bab57d 100644
--- a/src/test/java/com/avaje/tests/compositekeys/TestCore.java
+++ b/src/test/java/com/avaje/tests/compositekeys/TestCore.java
@@ -1,20 +1,13 @@
 package com.avaje.tests.compositekeys;
 
-import java.util.List;
-
 import com.avaje.ebean.Ebean;
 import com.avaje.ebean.Query;
 import com.avaje.ebean.Transaction;
-import com.avaje.tests.compositekeys.db.Item;
-import com.avaje.tests.compositekeys.db.ItemKey;
-import com.avaje.tests.compositekeys.db.Region;
-import com.avaje.tests.compositekeys.db.RegionKey;
-import com.avaje.tests.compositekeys.db.SubType;
-import com.avaje.tests.compositekeys.db.SubTypeKey;
-import com.avaje.tests.compositekeys.db.Type;
-import com.avaje.tests.compositekeys.db.TypeKey;
+import com.avaje.tests.compositekeys.db.*;
 import com.avaje.tests.lib.EbeanTestCase;
 
+import java.util.List;
+
 /**
  * Test some of the Avaje core functionality in conjunction with composite keys like
  * <ul>
@@ -113,7 +106,7 @@ public class TestCore extends EbeanTestCase {
 //        qItems.where(Expr.eq("key.customer", Integer.valueOf(1)));
 
     // I want to discourage the direct use of Expr
-    qItems.where().eq("key.customer", Integer.valueOf(1));
+    qItems.where().eq("key.customer", 1);
     items = qItems.findList();
 
     assertNotNull(items);
diff --git a/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java b/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java
index 4e7cefb0c..00955ed89 100644
--- a/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java
+++ b/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java
@@ -139,7 +139,7 @@ public class SqlQueryTests extends BaseTestCase {
       public boolean accept(SqlRow bean) {
         count.incrementAndGet();
         Integer id = bean.getInteger("id");
-        return id.intValue() < 3;
+        return id < 3;
       }
     });