diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/com/avaje/ebean/EbeanServer.java
index a2bb1f4b4..f09304f87 100644
--- a/src/main/java/com/avaje/ebean/EbeanServer.java
+++ b/src/main/java/com/avaje/ebean/EbeanServer.java
@@ -752,7 +752,7 @@ public interface EbeanServer {
    *
    * @see Query#findIds()
    */
-  <A> List<A> findIds(Query<?> query, Transaction transaction);
+  <A, T> List<A> findIds(Query<T> query, Transaction transaction);
 
   /**
    * Return a QueryIterator for the query.
@@ -1024,7 +1024,7 @@ public interface EbeanServer {
    *
    * @see Query#findSingleAttributeList()
    */
-  <A> List<A> findSingleAttributeList(Query<?> query, Transaction transaction);
+  <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction);
 
   /**
    * Execute the query returning at most one entity bean or null (if no matching
diff --git a/src/main/java/com/avaje/ebean/FutureRowCount.java b/src/main/java/com/avaje/ebean/FutureRowCount.java
index 36aa6ab33..7c9bc747c 100644
--- a/src/main/java/com/avaje/ebean/FutureRowCount.java
+++ b/src/main/java/com/avaje/ebean/FutureRowCount.java
@@ -9,6 +9,7 @@ import java.util.concurrent.Future;
  * It extends the java.util.concurrent.Future.
  * </p>
  * 
+ * @param <T> the BeanType 
  * @author rbygrave
  */
 public interface FutureRowCount<T> extends Future<Integer> {
diff --git a/src/main/java/com/avaje/ebean/PersistenceIOException.java b/src/main/java/com/avaje/ebean/PersistenceIOException.java
index 08c26556f..bef4da6da 100644
--- a/src/main/java/com/avaje/ebean/PersistenceIOException.java
+++ b/src/main/java/com/avaje/ebean/PersistenceIOException.java
@@ -7,6 +7,8 @@ import javax.persistence.PersistenceException;
  */
 public class PersistenceIOException extends PersistenceException {
 
+  private static final long serialVersionUID = -7630050437148176148L;
+
   public PersistenceIOException(String msg, Exception cause) {
     super(msg, cause);
   }
diff --git a/src/main/java/com/avaje/ebean/common/BeanMap.java b/src/main/java/com/avaje/ebean/common/BeanMap.java
index f046c83f9..2ad9feadf 100644
--- a/src/main/java/com/avaje/ebean/common/BeanMap.java
+++ b/src/main/java/com/avaje/ebean/common/BeanMap.java
@@ -265,7 +265,6 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
     return map.put(key, value);
   }
 
-  @SuppressWarnings({ "unchecked", "rawtypes" })
   public void putAll(Map<? extends K, ? extends E> puts) {
     checkReadOnly();
     init();
diff --git a/src/main/java/com/avaje/ebean/config/ServerConfig.java b/src/main/java/com/avaje/ebean/config/ServerConfig.java
index 2f0230220..5a16413b2 100644
--- a/src/main/java/com/avaje/ebean/config/ServerConfig.java
+++ b/src/main/java/com/avaje/ebean/config/ServerConfig.java
@@ -2311,7 +2311,6 @@ public class ServerConfig {
    * @param key        properties key
    * @param instance   existing instance
    */
-  @SuppressWarnings("unchecked")
   protected <T> T createInstance(PropertiesWrapper properties, Class<T> pluginType, String key, T instance) {
 
     if (instance != null) {
@@ -2327,6 +2326,7 @@ public class ServerConfig {
    * @param pluginType the type of plugin
    * @param classname  the implementation class as per properties
    */
+  @SuppressWarnings("unchecked")
   protected <T> T createInstance(Class<T> pluginType, String classname) {
     return classname == null ? null : (T) classLoadConfig.newInstance(classname);
   }
diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbIdentity.java b/src/main/java/com/avaje/ebean/config/dbplatform/DbIdentity.java
index 9c20467dc..442493059 100644
--- a/src/main/java/com/avaje/ebean/config/dbplatform/DbIdentity.java
+++ b/src/main/java/com/avaje/ebean/config/dbplatform/DbIdentity.java
@@ -135,9 +135,9 @@ public class DbIdentity {
         return supportsSequence ? IdType.SEQUENCE : idType;
       case IDENTITY:
         return supportsIdentity ? IdType.IDENTITY : idType;
+      default:
+        return idType;
     }
 
-    // use the default
-    return idType;
   }
 }
diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeMapping.java b/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeMapping.java
index 8906f911a..94c3f3a8a 100644
--- a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeMapping.java
+++ b/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeMapping.java
@@ -2,7 +2,6 @@ package com.avaje.ebean.config.dbplatform;
 
 import com.avaje.ebean.config.ServerConfig;
 
-import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java b/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java
index 5fce3ba11..68e67323f 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java
@@ -16,8 +16,8 @@ import java.io.InputStream;
  */
 public class MigrationXmlReader {
 
-  private static final MigrationXmlReader INSTANCE = new MigrationXmlReader();
-
+  private MigrationXmlReader() {}
+  
   /**
    * Read and return a Migration from an xml document at the given resource path.
    */
@@ -28,7 +28,7 @@ public class MigrationXmlReader {
       throw new IllegalArgumentException("No resource found for path [" + resourcePath + "]");
     }
 
-    return INSTANCE.read(is);
+    return read(is);
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebean/event/BeanPostConstructListener.java b/src/main/java/com/avaje/ebean/event/BeanPostConstructListener.java
index 1893b480e..c1b4cca99 100644
--- a/src/main/java/com/avaje/ebean/event/BeanPostConstructListener.java
+++ b/src/main/java/com/avaje/ebean/event/BeanPostConstructListener.java
@@ -1,7 +1,6 @@
 package com.avaje.ebean.event;
 
 import com.avaje.ebean.EbeanServer;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
 
 /**
  * Fired after a bean is constructed, but not yet loaded from database.
diff --git a/src/main/java/com/avaje/ebean/plugin/ExtraTypeFactory.java b/src/main/java/com/avaje/ebean/plugin/ExtraTypeFactory.java
index be43b26a9..9ea259668 100644
--- a/src/main/java/com/avaje/ebean/plugin/ExtraTypeFactory.java
+++ b/src/main/java/com/avaje/ebean/plugin/ExtraTypeFactory.java
@@ -13,5 +13,5 @@ public interface ExtraTypeFactory {
   /**
    * Provide extra types to Ebean.
    */
-  List<? extends ScalarType> createTypes(ServerConfig config, Object objectMapper);
+  List<? extends ScalarType<?>> createTypes(ServerConfig config, Object objectMapper);
 }
diff --git a/src/main/java/com/avaje/ebean/text/json/JsonIOException.java b/src/main/java/com/avaje/ebean/text/json/JsonIOException.java
index d14fc7c06..58f0a46eb 100644
--- a/src/main/java/com/avaje/ebean/text/json/JsonIOException.java
+++ b/src/main/java/com/avaje/ebean/text/json/JsonIOException.java
@@ -8,6 +8,8 @@ package com.avaje.ebean.text.json;
  */
 public class JsonIOException extends RuntimeException {
 
+  private static final long serialVersionUID = 3062982368161342209L;
+
   /**
    * Construct with an underlying cause.
    */
diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java
index cc98af802..f375d7cab 100644
--- a/src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java
@@ -145,7 +145,7 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    * the query has finished (if executing in a background thread).
    * </p>
    */
-  <A> List<A> findIdsWithCopy(Query<?> query, Transaction t);
+  <A, T> List<A> findIdsWithCopy(Query<T> query, Transaction t);
 
   /**
    * Execute the findRowCount query but without copying the query.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
index 5a7942259..da8ebf80c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
@@ -63,7 +63,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
     this.queryTuner = new BaseQueryTuner(config, server, profileManager);
     this.skipGarbageCollectionOnShutdown = config.isSkipGarbageCollectionOnShutdown();
     this.skipProfileReportingOnShutdown = config.isSkipProfileReportingOnShutdown();
-    this.defaultGarbageCollectionWait = (long) config.getGarbageCollectionWait();
+    this.defaultGarbageCollectionWait = config.getGarbageCollectionWait();
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/TunedQueryInfo.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/TunedQueryInfo.java
index e6b0bce46..55ab0956c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/TunedQueryInfo.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/TunedQueryInfo.java
@@ -13,6 +13,8 @@ import java.io.Serializable;
  */
 public class TunedQueryInfo implements Serializable {
 
+  private static final long serialVersionUID = 8661702592481810396L;
+
   private final Origin origin;
 
   private final OrmQueryDetail tunedDetail;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java b/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java
index 30b1dc833..7b5a06946 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java
@@ -17,7 +17,7 @@ public class CacheChangeSet {
 
   private final List<CacheChange> entries = new ArrayList<CacheChange>();
 
-  private final Set<BeanDescriptor> queryCaches = new HashSet<BeanDescriptor>();
+  private final Set<BeanDescriptor<?>> queryCaches = new HashSet<>();
 
   private final Map<ManyKey, ManyChange> manyChangeMap = new HashMap<ManyKey, ManyChange>();
 
@@ -41,7 +41,7 @@ public class CacheChangeSet {
    * Return the set of table changes to process invalidation for entities based on views.
    */
   public Set<String> apply() {
-    for (BeanDescriptor entry : queryCaches) {
+    for (BeanDescriptor<?> entry : queryCaches) {
       entry.queryCacheClear();
     }
     for (CacheChange entry : entries) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java
index 4088a9faa..16f1d3d78 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java
@@ -57,7 +57,6 @@ public class CachedBeanData implements Externalizable {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
     version = in.readLong();
     whenCreated = in.readLong();
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java
index 50ad811d5..fb904faeb 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -140,7 +140,7 @@ public class DefaultBeanLoader {
       }
     }
 
-    SpiQuery<?> query = (SpiQuery<?>) server.createQuery(parentDesc.getBeanType());
+    SpiQuery<?> query = server.createQuery(parentDesc.getBeanType());
 
     if (refresh) {
       // populate a new collection
@@ -205,7 +205,7 @@ public class DefaultBeanLoader {
       return;
     }
 
-    SpiQuery<?> query = (SpiQuery<?>) server.createQuery(loadRequest.getBeanType());
+    SpiQuery<?> query = server.createQuery(loadRequest.getBeanType());
     loadRequest.configureQuery(query, idList);
 
     List<?> list = executeQuery(loadRequest, query);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
index 99aab043f..437aa4c88 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
@@ -273,6 +273,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   public int getLazyLoadBatchSize() {
     return lazyLoadBatchSize;
   }
+  
+  public int getQueryBatchSize() {
+    return queryBatchSize;
+  }
 
   public ServerConfig getServerConfig() {
     return serverConfig;
@@ -1124,7 +1128,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
     try {
       request.initTransIfRequired();
-      return (Set<T>) request.findSet();
+      return request.findSet();
 
     } finally {
       request.endTransIfRequired();
@@ -1143,7 +1147,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
     try {
       request.initTransIfRequired();
-      return (Map<K, T>) request.findMap();
+      return request.findMap();
 
     } finally {
       request.endTransIfRequired();
@@ -1152,9 +1156,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   @SuppressWarnings("unchecked")
-  public <A> List<A> findSingleAttributeList(Query<?> query, Transaction t) {
+  public <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction t) {
 
-    SpiOrmQueryRequest request = createQueryRequest(Type.ATTRIBUTE, query, t);
+    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ATTRIBUTE, query, t);
     Object result = request.getFromQueryCache();
     if (result != null) {
       return (List<A>) result;
@@ -1190,12 +1194,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
-  public <A> List<A> findIds(Query<?> query, Transaction t) {
+  public <A, T> List<A> findIds(Query<T> query, Transaction t) {
 
-    return findIdsWithCopy(((SpiQuery<?>) query).copy(), t);
+    return findIdsWithCopy(((SpiQuery<T>) query).copy(), t);
   }
 
-  public <A> List<A> findIdsWithCopy(Query<?> query, Transaction t) {
+  public <A, T> List<A> findIdsWithCopy(Query<T> query, Transaction t) {
 
     SpiOrmQueryRequest<?> request = createQueryRequest(Type.ID_LIST, query, t);
     try {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DiffHelp.java b/src/main/java/com/avaje/ebeaninternal/server/core/DiffHelp.java
index a59866716..0f6c5d0ea 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DiffHelp.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DiffHelp.java
@@ -71,7 +71,7 @@ public class DiffHelp {
         iterator.remove();
 
       } else if (beanProperty instanceof BeanPropertyAssocOne) {
-        BeanPropertyAssocOne assoc = (BeanPropertyAssocOne)beanProperty;
+        BeanPropertyAssocOne<?> assoc = (BeanPropertyAssocOne<?>)beanProperty;
         if (!assoc.isEmbedded()) {
           // flatten for assoc one beans
           if (flattened == null) {
@@ -90,7 +90,7 @@ public class DiffHelp {
     return values;
   }
 
-  private static void flattenToId(Map<String, ValuePair> flattened, Map.Entry<String, ValuePair> entry, BeanProperty beanProperty, BeanPropertyAssocOne assoc) {
+  private static void flattenToId(Map<String, ValuePair> flattened, Map.Entry<String, ValuePair> entry, BeanProperty beanProperty, BeanPropertyAssocOne<?> assoc) {
 
     BeanDescriptor<?> oneDesc = assoc.getTargetDescriptor();
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java
index c38f9b257..c4fd5a141 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java
@@ -968,6 +968,8 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
           docStoreUpdates.queueIndex(beanDescriptor.getDocStoreQueueId(), idValue);
         }
       }
+      default:
+        break;
     }
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelp.java
index 4fe99bdb9..307698334 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelp.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelp.java
@@ -12,11 +12,11 @@ import java.sql.SQLException;
  */
 abstract class AssocOneHelp {
 
-  protected final BeanPropertyAssocOne property;
+  protected final BeanPropertyAssocOne<?> property;
 
-  protected final BeanDescriptor target;
+  protected final BeanDescriptor<?> target;
 
-  AssocOneHelp(BeanPropertyAssocOne property) {
+  AssocOneHelp(BeanPropertyAssocOne<?> property) {
     this.property = property;
     this.target = property.targetDescriptor;
   }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java
index ba69d7b2e..b1e3bd45b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java
@@ -9,7 +9,7 @@ import java.sql.SQLException;
  */
 final class AssocOneHelpEmbedded extends AssocOneHelp {
 
-  public AssocOneHelpEmbedded(BeanPropertyAssocOne property) {
+  public AssocOneHelpEmbedded(BeanPropertyAssocOne<?> property) {
     super(property);
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefExported.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
index c0ff608f2..318a158a3 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
@@ -7,7 +7,7 @@ import com.avaje.ebeaninternal.server.query.SqlJoinType;
  */
 class AssocOneHelpRefExported extends AssocOneHelp {
 
-  public AssocOneHelpRefExported(BeanPropertyAssocOne property) {
+  public AssocOneHelpRefExported(BeanPropertyAssocOne<?> property) {
     super(property);
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
index 4791cb641..6ec408677 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
@@ -13,7 +13,7 @@ class AssocOneHelpRefInherit extends AssocOneHelp {
 
   private final InheritInfo inherit;
 
-  AssocOneHelpRefInherit(BeanPropertyAssocOne property) {
+  AssocOneHelpRefInherit(BeanPropertyAssocOne<?> property) {
     super(property);
     this.inherit = property.targetInheritInfo;
   }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java
index 72dd6a533..f84e861cf 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java
@@ -5,7 +5,7 @@ package com.avaje.ebeaninternal.server.deploy;
  */
 class AssocOneHelpRefSimple extends AssocOneHelp {
 
-  AssocOneHelpRefSimple(BeanPropertyAssocOne property) {
+  AssocOneHelpRefSimple(BeanPropertyAssocOne<?> property) {
     super(property);
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
index 6fcc8319c..a4589ec53 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
@@ -69,6 +69,7 @@ public final class BeanDescriptorDraftHelp<T> {
    * This will recursive transfer values to all @DraftableElement properties.
    * </p>
    */
+  @SuppressWarnings("unchecked")
   public T publish(T draftBean, T liveBean) {
 
     if (liveBean == null) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java
index ab4ef1c81..4f7e79b1e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -645,6 +645,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   /**
    * Return the bean deploy info for the given class.
    */
+  @SuppressWarnings("unchecked")
   public <T> DeployBeanInfo<T> getDeploy(Class<T> cls) {
     return (DeployBeanInfo<T>) deployInfoMap.get(cls);
   }
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 9b31e7556..6340c9fb0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java
@@ -92,16 +92,14 @@ public final class BeanMapHelp<T> implements BeanCollectionHelp<T> {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
   public BeanCollection<T> createEmptyNoParent() {
-    return new BeanMap();
+    return new BeanMap<>();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
   public BeanCollection<T> createEmpty(EntityBean ownerBean) {
 
-    BeanMap beanMap = new BeanMap(loader, ownerBean, propertyName);
+    BeanMap<?,T> beanMap = new BeanMap<>(loader, ownerBean, propertyName);
     if (many != null) {
       beanMap.setModifyListening(many.getModifyListenMode());
     }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index a64586646..5c68c35b5 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -1032,6 +1032,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     }
   }
 
+  @SuppressWarnings("unchecked")
   private Map<Object,T> liveBeansAsMap(BeanCollection<?> liveVal) {
 
     liveVal.size();
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java
index 39a22f58e..1b0b384c0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java
@@ -125,10 +125,8 @@ public class BeanPropertyCompound extends BeanProperty {
    * Read the data from the resultSet effectively ignoring it and returning
    * null.
    */
-  @SuppressWarnings("unchecked")
   @Override
   public Object read(DbReadContext ctx) throws SQLException {
-
     return compoundType.read(ctx.getDataReader());
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundScalar.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundScalar.java
index 902dad24b..3df6100df 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundScalar.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundScalar.java
@@ -23,12 +23,10 @@ public class BeanPropertyCompoundScalar extends BeanProperty {
   /**
    * Return one of the scalar values from a compound type.
    */
-  @SuppressWarnings("unchecked")
   public Object getValueObject(Object compoundValue) {
     return ctProperty.getValue(compoundValue);
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public Object getValue(EntityBean valueObject) {
     return ctProperty.getValue(valueObject);
@@ -39,7 +37,6 @@ public class BeanPropertyCompoundScalar extends BeanProperty {
     setValueInCompound(bean, value, false);
   }
 
-  @SuppressWarnings("unchecked")
   public void setValueInCompound(EntityBean bean, Object value, boolean intercept) {
 
     Object compoundValue = ctProperty.setValue(bean, value);
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 b1f88c4db..1990c30ed 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java
@@ -70,9 +70,8 @@ public final class BeanSetHelp<T> implements BeanCollectionHelp<T> {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
   public BeanCollection<T> createEmptyNoParent() {
-    return new BeanSet();
+    return new BeanSet<>();
   }
 
   @Override
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
index 1dc7f4a88..43579af80 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
@@ -244,6 +244,7 @@ public final class IdBinderEmbedded implements IdBinder {
   /**
    * Convert back from a Map to embedded bean.
    */
+  @SuppressWarnings("unchecked")
   public Object convertIdFromJson(Object value) {
 
     Map<String,Object> map = (Map<String, Object>)value;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java
index f8491c300..a979879a2 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java
@@ -291,7 +291,7 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
           String propName = SplitName.add(prefix, beanProperty.getName());
           if (beanProperty.isScalar()) {
             if (value instanceof String) {
-              list.add(new LikeExpression(propName, (String) value, caseInsensitive, likeType));
+              list.add(new LikeExpression(propName, value, caseInsensitive, likeType));
             } else {
               // exclude the zero values typically to weed out
               // primitive int and long that initialise to 0
@@ -301,8 +301,8 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
             }
 
           } else if ((beanProperty instanceof BeanPropertyAssocOne) && (value instanceof EntityBean)) {
-            BeanPropertyAssocOne assocOne = (BeanPropertyAssocOne) beanProperty;
-            BeanDescriptor targetDescriptor = assocOne.getTargetDescriptor();
+            BeanPropertyAssocOne<?> assocOne = (BeanPropertyAssocOne<?>) beanProperty;
+            BeanDescriptor<?> targetDescriptor = assocOne.getTargetDescriptor();
             addExpressions(list, targetDescriptor, (EntityBean) value, propName);
           }
         }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/NamedParamHelp.java b/src/main/java/com/avaje/ebeaninternal/server/expression/NamedParamHelp.java
index 1defe77e5..b35005020 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/NamedParamHelp.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/NamedParamHelp.java
@@ -35,7 +35,7 @@ class NamedParamHelp {
 
     Object value = value(sourceValue);
     if (value instanceof Collection) {
-      values.addAll((Collection)value);
+      values.addAll((Collection<?>)value);
     } else {
       values.add(value);
     }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java
index 1733d132f..93d84b882 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java
@@ -8,9 +8,9 @@ import java.util.List;
 
 class EqlAdapterHelper {
 
-  private final EqlAdapter owner;
+  private final EqlAdapter<?> owner;
 
-  public EqlAdapterHelper(EqlAdapter owner) {
+  public EqlAdapterHelper(EqlAdapter<?> owner) {
     this.owner = owner;
   }
 
@@ -49,7 +49,6 @@ class EqlAdapterHelper {
     peekExprList().between(path, bind(value1), bind(value2));
   }
 
-  @SuppressWarnings("unchecked")
   protected void addIn(String path, List<Object> inValues) {
     peekExprList().in(path, inValues);
   }
@@ -117,7 +116,7 @@ class EqlAdapterHelper {
     return getBindValue(valueType, value);
   }
 
-  private ExpressionList peekExprList() {
+  private ExpressionList<?> peekExprList() {
     return owner.peekExprList();
   }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ArrayElementConverter.java b/src/main/java/com/avaje/ebeaninternal/server/type/ArrayElementConverter.java
index 9bd2d23b7..349c3757b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ArrayElementConverter.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ArrayElementConverter.java
@@ -15,27 +15,27 @@ interface ArrayElementConverter<T> {
   /**
    * The UUID converter implementation.
    */
-  ArrayElementConverter UUID = new UuidConverter();
+  ArrayElementConverter<UUID> UUID = new UuidConverter();
 
   /**
    * The String converter implementation.
    */
-  ArrayElementConverter STRING = new StringConverter();
+  ArrayElementConverter<String> STRING = new StringConverter();
 
   /**
    * The Long converter implementation.
    */
-  ArrayElementConverter LONG = new LongConverter();
+  ArrayElementConverter<Long> LONG = new LongConverter();
 
   /**
    * The Integer converter implementation.
    */
-  ArrayElementConverter INTEGER = new IntegerConverter();
+  ArrayElementConverter<Integer> INTEGER = new IntegerConverter();
 
   /**
    * The Double converter implementation.
    */
-  ArrayElementConverter DOUBLE = new DoubleConverter();
+  ArrayElementConverter<Double> DOUBLE = new DoubleConverter();
 
   class LongConverter implements ArrayElementConverter<Long> {
 
@@ -87,6 +87,7 @@ interface ArrayElementConverter<T> {
 
   class NoopConverter<T> implements ArrayElementConverter<T> {
 
+    @SuppressWarnings("unchecked")
     @Override
     public T toElement(Object rawValue) {
       return (T) rawValue;
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 04a496647..0bb17902e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/util/BeanCollectionFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/util/BeanCollectionFactory.java
@@ -25,16 +25,15 @@ public class BeanCollectionFactory {
   /**
    * Create a BeanCollection for the given parameters.
    */
-  @SuppressWarnings("unchecked")
   public static BeanCollection<?> create(SpiQuery.Type manyType) {
 
     switch (manyType) {
       case MAP:
-        return new BeanMap(new LinkedHashMap(defaultMapInitialCapacity));
+        return new BeanMap<>(new LinkedHashMap<>(defaultMapInitialCapacity));
       case LIST:
-        return new BeanList(new ArrayList(defaultListInitialCapacity));
+        return new BeanList<>(new ArrayList<>(defaultListInitialCapacity));
       case SET:
-        return new BeanSet(new LinkedHashSet(defaultSetInitialCapacity));
+        return new BeanSet<>(new LinkedHashSet<>(defaultSetInitialCapacity));
 
       default:
         throw new RuntimeException("Invalid Arg " + manyType);
diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocumentNotFoundException.java b/src/main/java/com/avaje/ebeanservice/docstore/api/DocumentNotFoundException.java
index 59f51e546..0bf95b34e 100644
--- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocumentNotFoundException.java
+++ b/src/main/java/com/avaje/ebeanservice/docstore/api/DocumentNotFoundException.java
@@ -5,6 +5,8 @@ package com.avaje.ebeanservice.docstore.api;
  */
 public class DocumentNotFoundException extends RuntimeException {
 
+  private static final long serialVersionUID = 2066138180892685276L;
+
   /**
    * Construct with a message.
    */
diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
index 878c487e7..aeb4dc840 100644
--- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
@@ -186,7 +186,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public <A> List<A> findIdsWithCopy(Query<?> query, Transaction t) {
+  public <A, T> List<A> findIdsWithCopy(Query<T> query, Transaction t) {
     return null;
   }
 
@@ -461,7 +461,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public <A> List<A> findIds(Query<?> query, Transaction transaction) {
+  public <A, T> List<A> findIds(Query<T> query, Transaction transaction) {
     return null;
   }
 
@@ -516,7 +516,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public <A> List<A> findSingleAttributeList(Query<?> query, Transaction transaction) {
+  public <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction) {
     return null;
   }