diff --git a/src/main/java/com/avaje/ebean/Model.java b/src/main/java/com/avaje/ebean/Model.java
index 0af575e80..600778c2c 100644
--- a/src/main/java/com/avaje/ebean/Model.java
+++ b/src/main/java/com/avaje/ebean/Model.java
@@ -441,6 +441,7 @@ public abstract class Model {
      *
      * }</pre>
      */
+    @SuppressWarnings("unchecked")
     public Find() {
       this.serverName = null;
       this.type = (Class<T>)ClassUtil.getSecondArgumentType(getClass());
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java
index d74aa48fc..c299e7893 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java
@@ -91,12 +91,13 @@ public final class BeanMapHelp<T> implements BeanCollectionHelp<T> {
   }
 
   @Override
+  @SuppressWarnings("unchecked")
   public BeanCollection<T> createEmptyNoParent() {
     return new BeanMap();
   }
 
   @Override
-  @SuppressWarnings("rawtypes")
+  @SuppressWarnings("unchecked")
   public BeanCollection<T> createEmpty(EntityBean ownerBean) {
 
     BeanMap beanMap = new BeanMap(loader, ownerBean, propertyName);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java
index c2da0f768..73ad8b5df 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java
@@ -66,6 +66,7 @@ public final class BeanSetHelp<T> implements BeanCollectionHelp<T> {
   }
 
   @Override
+  @SuppressWarnings("unchecked")
   public BeanCollection<T> createEmptyNoParent() {
     return new BeanSet();
   }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/CompoundTypePeriod.java b/src/main/java/com/avaje/ebeaninternal/server/type/CompoundTypePeriod.java
index 9a20031b4..685e2c0b0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/CompoundTypePeriod.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/CompoundTypePeriod.java
@@ -27,6 +27,7 @@ public class CompoundTypePeriod implements CompoundType<Period> {
   }
 
   @Override
+  @SuppressWarnings("unchecked")
   public CompoundTypeProperty<Period, ?>[] getProperties() {
     return properties;
   }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundPropertyElAdapter.java b/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundPropertyElAdapter.java
index 4d1081bec..c1f675bf0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundPropertyElAdapter.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundPropertyElAdapter.java
@@ -1,7 +1,6 @@
 package com.avaje.ebeaninternal.server.type;
 
 import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebean.text.StringFormatter;
 import com.avaje.ebean.text.StringParser;
 import com.avaje.ebeaninternal.server.deploy.BeanProperty;
 import com.avaje.ebeaninternal.server.el.ElPropertyValue;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/util/BeanCollectionFactory.java b/src/main/java/com/avaje/ebeaninternal/server/util/BeanCollectionFactory.java
index 6c36ca0de..04a496647 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/util/BeanCollectionFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/util/BeanCollectionFactory.java
@@ -25,6 +25,7 @@ public class BeanCollectionFactory {
   /**
    * Create a BeanCollection for the given parameters.
    */
+  @SuppressWarnings("unchecked")
   public static BeanCollection<?> create(SpiQuery.Type manyType) {
 
     switch (manyType) {