diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
index 16cee411c..cc64fb097 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java
@@ -36,11 +36,6 @@ public interface SpiDtoQuery<T> extends DtoQuery<T>, SpiSqlBinding {
    */
   boolean isRelaxedMode();
 
-  /**
-   * Return the label for the query.
-   */
-  String getLabel();
-
   /**
    * Return the label with fallback to profile location label.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java
index c4764b30f..5c4ce37ed 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java
@@ -44,8 +44,4 @@ public interface SpiExpressionList<T> extends ExpressionList<T>, SpiExpression {
     // do nothing by default
   }
 
-  /**
-   * Apply property prefix when filterMany expressions included in main query.
-   */
-  void prefixProperty(String path);
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index c023f2d0d..e03ce40ce 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -114,6 +114,7 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
     return queryEngine.findList(this);
   }
 
+  @Override
   public boolean next() throws SQLException {
     query.checkCancelled();
     return dataReader.next();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index f16a9d7cd..ae16bbd4b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -145,6 +145,7 @@ public final class PersistRequestUpdateSql extends PersistRequest {
     this.bindLog = bindLog;
   }
 
+  @Override
   public void startBind(boolean batchThisRequest) {
     this.batchThisRequest = batchThisRequest;
     super.startBind(batchThisRequest);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 3b3c5946c..768cba19c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -154,6 +154,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   /**
    * Return the property value as an entity bean.
    */
+  @Override
   public EntityBean getValueAsEntityBean(EntityBean owner) {
     return (EntityBean) getValue(owner);
   }
@@ -203,6 +204,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
+  @Override
   Object naturalKeyVal(Map<String, Object> values) {
     EntityBean bean = (EntityBean) values.get(name);
     if (bean == null) {
@@ -339,6 +341,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
+  @Override
   public boolean hasForeignKey() {
     return foreignKey == null || primaryKeyJoin || !foreignKey.isNoConstraint();
   }
@@ -402,6 +405,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   /**
    * Return the bean cache value for this property using original values.
    */
+  @Override
   public Object getCacheDataValueOrig(EntityBeanIntercept ebi) {
     return cacheDataConvert(ebi.getOrigValue(propertyIndex));
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index c63b7ed9a..34026b61a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -150,6 +150,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Add to the flush queue in position 0, 1 or 2.
    */
+  @Override
   public void addToFlushQueue(SpiSqlUpdate update, SpiTransaction t, int pos) {
     new PersistRequestUpdateSql(server, update, t, persistExecute).addToFlushQueue(pos);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
index 693aa5de8..ba74a5e65 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java
@@ -26,6 +26,7 @@ final class DCountMetric implements CountMetric {
     count.add(value);
   }
 
+  @Override
   public void increment() {
     count.increment();
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
index df4c44c56..684cd1a00 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java
@@ -82,6 +82,7 @@ class DProfileLocation implements ProfileLocation {
     }
   }
 
+  @Override
   public void setTraceCount(int traceCount) {
     this.traceCount = traceCount;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 65ba6b9a3..daca677b4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1339,6 +1339,7 @@ public final class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<
     return fetchInternal(path, null, FETCH_QUERY);
   }
 
+  @Override
   public Query<T> fetchCache(String path) {
     return fetchInternal(path, null, FETCH_CACHE);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
index 1064bf8bc..20b6d8a2a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java
@@ -65,6 +65,7 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
     return new DefaultPersistenceContext(this, false);
   }
 
+  @Override
   public boolean resetLimit() {
     lock.lock();
     try {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 37a53f680..81a840dbf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -201,6 +201,7 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Return the scope manager.
    */
+  @Override
   public final TransactionScopeManager scope() {
     return scopeManager;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
index f2c2c1ee7..372de8c86 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
@@ -104,6 +104,7 @@ interface ArrayElementConverter<T> {
    */
   class StringConverter implements ArrayElementConverter<String> {
 
+    @Override
     public String fromDbArray(Object rawValue) {
       return (String) rawValue;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
index 286818c37..630fe73a3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
@@ -19,6 +19,7 @@ final class ScalarTypeLocalDate extends ScalarTypeBaseDate<LocalDate> {
     super(mode, LocalDate.class, false, Types.DATE);
   }
 
+  @Override
   protected String toIsoFormat(LocalDate value) {
     return value.toString();
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
index 3a816d498..725d76055 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
@@ -95,6 +95,7 @@ final class ScalarTypeUtilDate {
       super(mode, Date.class, false, Types.DATE);
     }
 
+    @Override
     protected String toIsoFormat(java.util.Date value) {
       return UtilDateParser.format(value);
     }
diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
index eaebe3f78..3e03fb46c 100644
--- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
+++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
@@ -90,6 +90,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase {
     LoggedSqlCollector.stop();
   }
 
+  @Override
   public boolean isPersistBatchOnCascade() {
     return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
   }
diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
index 2da2d9d1f..a73e62c47 100644
--- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
+++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
@@ -96,6 +96,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase {
     LoggedSqlCollector.stop();
   }
 
+  @Override
   public boolean isPersistBatchOnCascade() {
     return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
   }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
index 807bec456..734621a66 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
@@ -24,6 +24,7 @@ public class PostgresDdl extends PlatformDdl {
     this.indexConcurrent = "concurrently ";
   }
 
+  @Override
   public String setLockTimeout(int lockTimeoutSeconds) {
     return "set lock_timeout = " + (lockTimeoutSeconds * 1000);
   }