diff --git a/src/main/java/com/avaje/ebean/text/csv/DefaultCsvCallback.java b/src/main/java/com/avaje/ebean/text/csv/DefaultCsvCallback.java
index 20c13bc6c..a3184d350 100644
--- a/src/main/java/com/avaje/ebean/text/csv/DefaultCsvCallback.java
+++ b/src/main/java/com/avaje/ebean/text/csv/DefaultCsvCallback.java
@@ -42,12 +42,12 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
   /**
    * Used to log a message to indicate progress through large files.
    */
-  protected int logInfoFrequency;
+  protected final int logInfoFrequency;
 
   /**
    * The batch size used when saving the beans.
    */
-  protected int persistBatchSize;
+  protected final int persistBatchSize;
 
   /**
    * The time the process started.
diff --git a/src/main/java/com/avaje/ebeaninternal/api/BindParams.java b/src/main/java/com/avaje/ebeaninternal/api/BindParams.java
index 50597f4bd..c0dc62556 100644
--- a/src/main/java/com/avaje/ebeaninternal/api/BindParams.java
+++ b/src/main/java/com/avaje/ebeaninternal/api/BindParams.java
@@ -20,9 +20,9 @@ public class BindParams implements Serializable {
 
 	private static final long serialVersionUID = 4541081933302086285L;
 
-	private List<Param> positionedParameters = new ArrayList<Param>();
+	private final List<Param> positionedParameters = new ArrayList<Param>();
 
-	private Map<String, Param> namedParameters = new LinkedHashMap<String, Param>();
+	private final Map<String, Param> namedParameters = new LinkedHashMap<String, Param>();
 	
 	/**
 	 * This is the sql. For named parameters this is the sql after the named
diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java
index 9c7ca94c7..fcf738a64 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java
@@ -42,12 +42,12 @@ public class DefaultAutoFetchManager implements AutoFetchManager, Serializable {
 	/**
 	 * Map of the usage and query statistics gathered.
 	 */
-	private Map<String, Statistics> statisticsMap = new ConcurrentHashMap<String, Statistics>();
+	private final Map<String, Statistics> statisticsMap = new ConcurrentHashMap<String, Statistics>();
 
 	/**
 	 * Map of the tuned query details per profile query point.
 	 */
-	private Map<String, TunedQueryInfo> tunedQueryInfoMap = new ConcurrentHashMap<String, TunedQueryInfo>();
+	private final Map<String, TunedQueryInfo> tunedQueryInfoMap = new ConcurrentHashMap<String, TunedQueryInfo>();
 
 	private transient long defaultGarbageCollectionWait = 100;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java b/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java
index 851933071..09d49f983 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java
@@ -56,7 +56,7 @@ public class DefaultServerCache implements ServerCache {
 
   protected int maxSize;
 
-  protected int trimFrequency;
+  protected final int trimFrequency;
 
   protected int maxIdleSecs;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessageList.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessageList.java
index 0c89a1611..01b757ec2 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessageList.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessageList.java
@@ -10,7 +10,7 @@ import java.util.List;
  */
 public class BinaryMessageList {
 
-    ArrayList<BinaryMessage> list = new ArrayList<BinaryMessage>();
+    final ArrayList<BinaryMessage> list = new ArrayList<BinaryMessage>();
     
     public void add(BinaryMessage msg) {
         list.add(msg);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/AckResendMessages.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/AckResendMessages.java
index 8483da8a7..7d12e6b72 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/AckResendMessages.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/AckResendMessages.java
@@ -10,7 +10,7 @@ import java.util.List;
  */
 public class AckResendMessages {
 
-    ArrayList<Message> messages = new ArrayList<Message>();
+    final ArrayList<Message> messages = new ArrayList<Message>();
     
     public String toString() {
         return messages.toString();
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/BootupClasses.java b/src/main/java/com/avaje/ebeaninternal/server/core/BootupClasses.java
index e4affca69..c74ff70d5 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/BootupClasses.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/BootupClasses.java
@@ -27,33 +27,33 @@ public class BootupClasses implements ClassPathSearchMatcher {
 
   private static final Logger logger = LoggerFactory.getLogger(BootupClasses.class);
 
-  private ArrayList<Class<?>> embeddableList = new ArrayList<Class<?>>();
+  private final ArrayList<Class<?>> embeddableList = new ArrayList<Class<?>>();
 
-  private ArrayList<Class<?>> entityList = new ArrayList<Class<?>>();
+  private final ArrayList<Class<?>> entityList = new ArrayList<Class<?>>();
 
-  private ArrayList<Class<?>> scalarTypeList = new ArrayList<Class<?>>();
+  private final ArrayList<Class<?>> scalarTypeList = new ArrayList<Class<?>>();
 
-  private ArrayList<Class<?>> scalarConverterList = new ArrayList<Class<?>>();
+  private final ArrayList<Class<?>> scalarConverterList = new ArrayList<Class<?>>();
 
-  private ArrayList<Class<?>> compoundTypeList = new ArrayList<Class<?>>();
+  private final ArrayList<Class<?>> compoundTypeList = new ArrayList<Class<?>>();
 
-  private ArrayList<Class<?>> beanControllerList = new ArrayList<Class<?>>();
+  private final ArrayList<Class<?>> beanControllerList = new ArrayList<Class<?>>();
 
-  private ArrayList<Class<?>> transactionEventListenerList = new ArrayList<Class<?>>();
+  private final ArrayList<Class<?>> transactionEventListenerList = new ArrayList<Class<?>>();
 
-  private ArrayList<Class<?>> beanFindControllerList = new ArrayList<Class<?>>();
-  private ArrayList<Class<?>> beanQueryAdapterList = new ArrayList<Class<?>>();
+  private final ArrayList<Class<?>> beanFindControllerList = new ArrayList<Class<?>>();
+  private final ArrayList<Class<?>> beanQueryAdapterList = new ArrayList<Class<?>>();
 
-  private ArrayList<Class<?>> beanListenerList = new ArrayList<Class<?>>();
+  private final ArrayList<Class<?>> beanListenerList = new ArrayList<Class<?>>();
 
-  private ArrayList<Class<?>> serverConfigStartupList = new ArrayList<Class<?>>();
-  private ArrayList<ServerConfigStartup> serverConfigStartupInstances = new ArrayList<ServerConfigStartup>();
+  private final ArrayList<Class<?>> serverConfigStartupList = new ArrayList<Class<?>>();
+  private final ArrayList<ServerConfigStartup> serverConfigStartupInstances = new ArrayList<ServerConfigStartup>();
 
-  private List<BeanFindController> findControllerInstances = new ArrayList<BeanFindController>();
-  private List<BeanPersistController> persistControllerInstances = new ArrayList<BeanPersistController>();
-  private List<BeanPersistListener> persistListenerInstances = new ArrayList<BeanPersistListener>();
-  private List<BeanQueryAdapter> queryAdapterInstances = new ArrayList<BeanQueryAdapter>();
-  private List<TransactionEventListener> transactionEventListenerInstances = new ArrayList<TransactionEventListener>();
+  private final List<BeanFindController> findControllerInstances = new ArrayList<BeanFindController>();
+  private final List<BeanPersistController> persistControllerInstances = new ArrayList<BeanPersistController>();
+  private final List<BeanPersistListener> persistListenerInstances = new ArrayList<BeanPersistListener>();
+  private final List<BeanQueryAdapter> queryAdapterInstances = new ArrayList<BeanQueryAdapter>();
+  private final List<TransactionEventListener> transactionEventListenerInstances = new ArrayList<TransactionEventListener>();
 
   public BootupClasses() {
   }
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 c4bdbb550..470c67cd6 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
@@ -131,17 +131,17 @@ public final class DefaultServer implements SpiEbeanServer {
   /**
    * The default batch size for lazy loading beans or collections.
    */
-  private int lazyLoadBatchSize;
+  private final int lazyLoadBatchSize;
 
   /** 
    * The query batch size 
    */
-  private int queryBatchSize;
+  private final int queryBatchSize;
 
   /**
    * JDBC driver specific handling for JDBC batch execution.
    */
-  private PstmtBatch pstmtBatch;
+  private final PstmtBatch pstmtBatch;
 
   /**
    * holds plugins (e.g. ddl generator) detected by the service loader
diff --git a/src/main/java/com/avaje/ebeaninternal/server/ddl/CreateIntersectionTable.java b/src/main/java/com/avaje/ebeaninternal/server/ddl/CreateIntersectionTable.java
index c3766270a..e7c114fdc 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/ddl/CreateIntersectionTable.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/ddl/CreateIntersectionTable.java
@@ -21,13 +21,13 @@ public class CreateIntersectionTable {
 	private final TableJoin intersectionTableJoin;
 	private final TableJoin tableJoin;
 
-	private StringBuilder sb = new StringBuilder();
+	private final StringBuilder sb = new StringBuilder();
 
-	private StringBuilder pkeySb = new StringBuilder();
+	private final StringBuilder pkeySb = new StringBuilder();
 
 	private int foreignKeyCount;
 	
-	private int maxFkeyLength;
+	private final int maxFkeyLength;
 	
 	public CreateIntersectionTable(DdlGenContext ctx, BeanPropertyAssocMany<?> manyProp) {
 		this.ctx = ctx;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/ddl/DdlGenContext.java b/src/main/java/com/avaje/ebeaninternal/server/ddl/DdlGenContext.java
index 4c4cb5fa6..a7141a1fe 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/ddl/DdlGenContext.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/ddl/DdlGenContext.java
@@ -43,10 +43,10 @@ public class DdlGenContext {
 	 */
 	private final List<String> contentBuffer = new ArrayList<String>();
 
-	private Set<String> intersectionTables = new HashSet<String>();
+	private final Set<String> intersectionTables = new HashSet<String>();
 
-	private List<String> intersectionTablesCreateDdl = new ArrayList<String>();
-	private List<String> intersectionTablesFkDdl = new ArrayList<String>();
+	private final List<String> intersectionTablesCreateDdl = new ArrayList<String>();
+	private final List<String> intersectionTablesFkDdl = new ArrayList<String>();
 
 	private final DatabasePlatform dbPlatform;
 	
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
index 6bb12822c..47523b5b8 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -147,7 +147,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo {
    */
   private volatile BeanPersistListener persistListener;
 
-  private volatile BeanQueryAdapter queryAdapter;
+  private final BeanQueryAdapter queryAdapter;
 
   /**
    * If set overrides the find implementation. Server side only.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFkeyProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFkeyProperty.java
index cf9f6873f..1ad07d73d 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFkeyProperty.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFkeyProperty.java
@@ -16,7 +16,7 @@ public final class BeanFkeyProperty implements ElPropertyValue {
   private final String dbColumn;
   private final boolean containsMany;
 
-  private int deployOrder;
+  private final int deployOrder;
 
   public BeanFkeyProperty(String prefix, String name, String dbColumn, int deployOrder) {
     this(prefix, name, dbColumn, deployOrder, false);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
index 40bb136c7..6a081dc7d 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
@@ -57,13 +57,13 @@ public class BeanLifecycleAdapterFactory {
   private static class MethodsHolder {
 
     private boolean hasListener;
-    private List<Method> preInserts = new ArrayList<Method>();
-    private List<Method> postInserts = new ArrayList<Method>();
-    private List<Method> preUpdates = new ArrayList<Method>();
-    private List<Method> postUpdates = new ArrayList<Method>();
-    private List<Method> preDeletes = new ArrayList<Method>();
-    private List<Method> postDeletes = new ArrayList<Method>();
-    private List<Method> postLoads = new ArrayList<Method>();
+    private final List<Method> preInserts = new ArrayList<Method>();
+    private final List<Method> postInserts = new ArrayList<Method>();
+    private final List<Method> preUpdates = new ArrayList<Method>();
+    private final List<Method> postUpdates = new ArrayList<Method>();
+    private final List<Method> preDeletes = new ArrayList<Method>();
+    private final List<Method> postDeletes = new ArrayList<Method>();
+    private final List<Method> postLoads = new ArrayList<Method>();
 
     private boolean hasListener() {
       return hasListener;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index 66fed4107..ffe9e207b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -64,7 +64,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
 	 */
 	final boolean isOuterJoin;
 
-	String extraWhere;
+	final String extraWhere;
 
 	boolean saveRecurseSkippable;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java b/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java
index 01f37ed29..8362defd4 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java
@@ -20,7 +20,7 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
 
   private final String namePrefix;
 
-  private int shutdownWaitSeconds;
+  private final int shutdownWaitSeconds;
 
   /**
    * Construct the DaemonScheduleThreadPool.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/BusyConnectionBuffer.java b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/BusyConnectionBuffer.java
index 38be65f7d..954882887 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/BusyConnectionBuffer.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/BusyConnectionBuffer.java
@@ -27,7 +27,7 @@ class BusyConnectionBuffer {
   
     private PooledConnection[] slots;
     
-    private int growBy;
+    private final int growBy;
     
     private int size;
     
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java
index 9601cab98..4d065c6f9 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java
@@ -111,7 +111,7 @@ public class DataSourcePool implements DataSource {
     /**
      * The max size of the stack trace to report.
      */
-    private int maxStackTraceSize;
+    private final int maxStackTraceSize;
 
     /**
      * flag to indicate we have sent an alert message.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java
index 88a60f359..28ff40180 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java
@@ -55,7 +55,7 @@ public class BatchedBeanHolder {
    * Set of beans in this batch. This is used to ensure that a single bean instance is not included
    * in the batch twice (two separate insert requests etc).
    */
-  private IdentityHashMap<Object,Object> persistedBeans = new IdentityHashMap<Object,Object>();
+  private final IdentityHashMap<Object,Object> persistedBeans = new IdentityHashMap<Object,Object>();
 
   /**
    * Create a new entry with a given type and depth.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java
index 4e8b79681..3bbced5ee 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java
@@ -25,7 +25,7 @@ public class BatchedPstmtHolder {
    * A Map of the statements using a String key. This is used so that the same
    * Statement,Prepared,Callable is reused.
    */
-  private LinkedHashMap<String, BatchedPstmt> stmtMap = new LinkedHashMap<String, BatchedPstmt>();
+  private final LinkedHashMap<String, BatchedPstmt> stmtMap = new LinkedHashMap<String, BatchedPstmt>();
 
   /**
    * The Max size across all the BatchedPstmt.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java
index 906d46872..e5891d3ae 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -39,7 +39,7 @@ public class DefaultDbSqlContext implements DbSqlContext {
 
   private HashSet<String> tableJoins;
 
-  private SqlTreeAlias alias;
+  private final SqlTreeAlias alias;
 
   private String currentPrefix;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index a4c148340..26680eab8 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -22,7 +22,7 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
 
 	private static final long serialVersionUID = -1098305779779591068L;
 
-	private transient EbeanServer server;
+	private final transient EbeanServer server;
 
 	private transient SqlQueryListener queryListener;
 
@@ -58,7 +58,7 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     /**
      * Bind parameters when using the query language.
      */
-	private BindParams bindParams = new BindParams();
+	private final BindParams bindParams = new BindParams();
     
 	/**
 	 * Additional supply a query detail object.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/csv/CsvUtilReader.java b/src/main/java/com/avaje/ebeaninternal/server/text/csv/CsvUtilReader.java
index 10baf82b8..650c94f5e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/text/csv/CsvUtilReader.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/text/csv/CsvUtilReader.java
@@ -33,15 +33,15 @@ import java.util.List;
  */
 public class CsvUtilReader {
 
-    private BufferedReader br;
+    private final BufferedReader br;
 
     private boolean hasNext = true;
 
-    private char separator;
+    private final char separator;
 
-    private char quotechar;
+    private final char quotechar;
     
-    private int skipLines;
+    private final int skipLines;
 
     private boolean linesSkiped;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanDeltaMap.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanDeltaMap.java
index 0987c2cf6..7429081ee 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanDeltaMap.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanDeltaMap.java
@@ -9,7 +9,7 @@ import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
 
 public class BeanDeltaMap {
 
-    private Map<String,BeanDeltaList> deltaMap = new HashMap<String,BeanDeltaList>();
+    private final Map<String,BeanDeltaList> deltaMap = new HashMap<String,BeanDeltaList>();
 
     public BeanDeltaMap() {
     }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPathUpdateIds.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPathUpdateIds.java
index 1f861162c..bbebbabff 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPathUpdateIds.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPathUpdateIds.java
@@ -15,11 +15,11 @@ import com.avaje.ebeaninternal.server.deploy.id.IdBinder;
 
 public class BeanPathUpdateIds {
     
-    private transient BeanDescriptor<?> beanDescriptor;
+    private final transient BeanDescriptor<?> beanDescriptor;
 
     private final String descriptorId;
 
-    private String path;
+    private final String path;
     
     private ArrayList<Serializable> ids;
     
diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/BulkEventListenerMap.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/BulkEventListenerMap.java
index 495fb3563..0e299bc9e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/BulkEventListenerMap.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/BulkEventListenerMap.java
@@ -47,8 +47,8 @@ public class BulkEventListenerMap {
     }
 
 	private static class Entry {
-		
-		List<BulkTableEventListener> listeners = new ArrayList<BulkTableEventListener>();
+
+    final List<BulkTableEventListener> listeners = new ArrayList<BulkTableEventListener>();
 		private void add(BulkTableEventListener l) {
 			listeners.add(l);
 		}
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 2209b470b..9a20031b4 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/CompoundTypePeriod.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/CompoundTypePeriod.java
@@ -13,7 +13,7 @@ import java.time.Period;
  */
 public class CompoundTypePeriod implements CompoundType<Period> {
 
-  CompoundTypeProperty[] properties = new CompoundTypeProperty[3];
+  final CompoundTypeProperty[] properties = new CompoundTypeProperty[3];
 
   public CompoundTypePeriod() {
     properties[0] = new CTPeriodYear();
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 3a7ba14a7..26d0d8442 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/util/BeanCollectionFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/util/BeanCollectionFactory.java
@@ -19,7 +19,7 @@ import com.avaje.ebeaninternal.api.SpiQuery;
 public class BeanCollectionFactory {
 
 	private static class BeanCollectionFactoryHolder {
-		private static BeanCollectionFactory me = new BeanCollectionFactory();
+		private static final BeanCollectionFactory me = new BeanCollectionFactory();
 	}
 	
     private static final int defaultListInitialCapacity = 20;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearch.java b/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearch.java
index 3579c4a02..6e315bad6 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearch.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearch.java
@@ -29,21 +29,21 @@ public class ClassPathSearch implements ClassPathSearchService {
 
   private ClassLoader classLoader;
 
-  private List<Object> classPath = new ArrayList<Object>();
+  private final List<Object> classPath = new ArrayList<Object>();
 
   private ClassPathSearchFilter filter;
 
   private ClassPathSearchMatcher matcher;
 
-  private ArrayList<Class<?>> matchList = new ArrayList<Class<?>>();
+  private final ArrayList<Class<?>> matchList = new ArrayList<Class<?>>();
 
-  private HashSet<String> jarHits = new HashSet<String>();
+  private final HashSet<String> jarHits = new HashSet<String>();
 
-  private HashSet<String> packageHits = new HashSet<String>();
+  private final HashSet<String> packageHits = new HashSet<String>();
 
   private ClassPathReader classPathReader = new DefaultClassPathReader();
 
-  private ArrayList<URI> scannedUris = new ArrayList<URI>();
+  private final ArrayList<URI> scannedUris = new ArrayList<URI>();
 
   public ClassPathSearch() {
     // Default Construct
diff --git a/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearchFilter.java b/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearchFilter.java
index ed7a6f200..8ea018a2a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearchFilter.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearchFilter.java
@@ -18,13 +18,13 @@ public class ClassPathSearchFilter {
 
 	private String ebeanJarPrefix = "ebean";
 
-	private HashSet<String> includePackageSet = new HashSet<String>();
+	private final HashSet<String> includePackageSet = new HashSet<String>();
 
-	private HashSet<String> excludePackageSet = new HashSet<String>();
+	private final HashSet<String> excludePackageSet = new HashSet<String>();
 
-	private HashSet<String> includeJarSet = new HashSet<String>();
+	private final HashSet<String> includeJarSet = new HashSet<String>();
 
-	private HashSet<String> excludeJarSet = new HashSet<String>();
+	private final HashSet<String> excludeJarSet = new HashSet<String>();
 
 	public ClassPathSearchFilter() {
 		addDefaultExcludePackages();