diff --git a/src/main/java/com/avaje/ebean/DRawSqlParser.java b/src/main/java/com/avaje/ebean/DRawSqlParser.java
index f151edbe1..7a537836b 100644
--- a/src/main/java/com/avaje/ebean/DRawSqlParser.java
+++ b/src/main/java/com/avaje/ebean/DRawSqlParser.java
@@ -24,7 +24,7 @@ class DRawSqlParser {
   private int placeHolderAndWhere;
   private int placeHolderHaving;
   private int placeHolderAndHaving;
-  private boolean hasPlaceHolders;
+  private final boolean hasPlaceHolders;
 
   private int selectPos = -1;
   private int distinctPos = -1;
diff --git a/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java b/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java
index 22a9ce6c6..d6b37351c 100644
--- a/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java
+++ b/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java
@@ -45,7 +45,7 @@ public final class EntityBeanIntercept implements Serializable {
   /**
    * The actual entity bean that 'owns' this intercept.
    */
-  private EntityBean owner;
+  private final EntityBean owner;
 
   private EntityBean embeddedOwner;
   private int embeddedOwnerIndex;
@@ -72,7 +72,7 @@ public final class EntityBeanIntercept implements Serializable {
   /**
    * Used when a bean is partially filled.
    */
-  private boolean[] loadedProps;
+  private final boolean[] loadedProps;
   
   private boolean fullyLoadedBean;
 
diff --git a/src/main/java/com/avaje/ebean/bean/PersistenceContext.java b/src/main/java/com/avaje/ebean/bean/PersistenceContext.java
index d6775abd4..103d9981c 100644
--- a/src/main/java/com/avaje/ebean/bean/PersistenceContext.java
+++ b/src/main/java/com/avaje/ebean/bean/PersistenceContext.java
@@ -74,7 +74,7 @@ public interface PersistenceContext {
      * The bean was previously deleted from this persistence context (can't hit
      * L2 cache).
      */
-    public static WithOption DELETED = new WithOption(true);
+    public static final WithOption DELETED = new WithOption(true);
 
     private final boolean deleted;
     private final Object bean;
diff --git a/src/main/java/com/avaje/ebean/config/PersistBatch.java b/src/main/java/com/avaje/ebean/config/PersistBatch.java
index 462a29a19..305372d95 100644
--- a/src/main/java/com/avaje/ebean/config/PersistBatch.java
+++ b/src/main/java/com/avaje/ebean/config/PersistBatch.java
@@ -36,7 +36,7 @@ public enum PersistBatch {
   INHERIT(false);
 
 
-  boolean forInsert;
+  final boolean forInsert;
 
   PersistBatch(boolean forInsert) {
     this.forInsert = forInsert;
diff --git a/src/main/java/com/avaje/ebean/text/json/EJsonReader.java b/src/main/java/com/avaje/ebean/text/json/EJsonReader.java
index 7aaa28a6d..15badf35b 100644
--- a/src/main/java/com/avaje/ebean/text/json/EJsonReader.java
+++ b/src/main/java/com/avaje/ebean/text/json/EJsonReader.java
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.JsonToken;
 
 class EJsonReader {
 
-  static JsonFactory json = new JsonFactory();
+  static final JsonFactory json = new JsonFactory();
 
   @SuppressWarnings("unchecked")
   static Map<String, Object> parseObject(String json, boolean modifyAware) throws IOException  {
diff --git a/src/main/java/com/avaje/ebean/text/json/EJsonWriter.java b/src/main/java/com/avaje/ebean/text/json/EJsonWriter.java
index 470a35c73..7be808cb6 100644
--- a/src/main/java/com/avaje/ebean/text/json/EJsonWriter.java
+++ b/src/main/java/com/avaje/ebean/text/json/EJsonWriter.java
@@ -19,7 +19,7 @@ class EJsonWriter {
   /**
    * Base jsonFactory implementation used when it is not passed in.
    */
-  static JsonFactory jsonFactory = new JsonFactory();
+  static final JsonFactory jsonFactory = new JsonFactory();
 
   static String write(Object object) throws IOException {
     StringWriter writer = new StringWriter(200);
diff --git a/src/main/java/com/avaje/ebean/text/json/JsonReadOptions.java b/src/main/java/com/avaje/ebean/text/json/JsonReadOptions.java
index e85e67466..4e4f04cbb 100644
--- a/src/main/java/com/avaje/ebean/text/json/JsonReadOptions.java
+++ b/src/main/java/com/avaje/ebean/text/json/JsonReadOptions.java
@@ -13,7 +13,7 @@ import java.util.Map;
  */
 public class JsonReadOptions {
 
-  protected Map<String, JsonReadBeanVisitor<?>> visitorMap;
+  protected final Map<String, JsonReadBeanVisitor<?>> visitorMap;
 
   protected Object objectMapper;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/Packet.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/Packet.java
index f7466c68f..e07e92e57 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/Packet.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/Packet.java
@@ -34,22 +34,22 @@ public class Packet {
     /**
      * The type of Packet.
      */
-    protected short packetType;
+    protected final short packetType;
     
     /**
      * The PacketId.
      */
-    protected long packetId;
+    protected final long packetId;
     
     /**
      * The timestamp the Packet was created.
      */
-    protected long timestamp;
+    protected final long timestamp;
     
     /**
      * The EbeanServer name this relates to if relevant.
      */
-    protected String serverName;
+    protected final String serverName;
     
     protected ByteArrayOutputStream buffer;
     protected DataOutputStream dataOut;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/IncomingPacketsLastAck.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/IncomingPacketsLastAck.java
index 0f688ab5a..a9301b926 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/IncomingPacketsLastAck.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/IncomingPacketsLastAck.java
@@ -16,7 +16,7 @@ import java.util.List;
  */
 public class IncomingPacketsLastAck {
 
-    private HashMap<String,MessageAck> lastAckMap = new HashMap<String, MessageAck>();
+    private final HashMap<String,MessageAck> lastAckMap = new HashMap<String, MessageAck>();
 
     public String toString() {
         return lastAckMap.values().toString();
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/IncomingPacketsProcessed.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/IncomingPacketsProcessed.java
index a024da601..7c8bbbfbf 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/IncomingPacketsProcessed.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/IncomingPacketsProcessed.java
@@ -103,9 +103,9 @@ public class IncomingPacketsProcessed {
         /**
          * Packets received out of order.
          */
-        private ArrayList<Long> outOfOrderList = new ArrayList<Long>();
+        private final ArrayList<Long> outOfOrderList = new ArrayList<Long>();
 
-        private HashMap<Long,Integer> resendCountMap = new HashMap<Long,Integer>();
+        private final HashMap<Long,Integer> resendCountMap = new HashMap<Long,Integer>();
 
         public GotAllPoint(String memberKey, int maxResendIncoming) {
             this.memberKey = memberKey;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastClusterManager.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastClusterManager.java
index 00a70fe99..9503b4472 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastClusterManager.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastClusterManager.java
@@ -102,12 +102,12 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
    * Packets are cleared from the outgoingPacketsCache quicker at the cost of
    * sending more packets.
    */
-  private long managerSleepMillis;
+  private final long managerSleepMillis;
 
   /**
    * When true then packets are still sent out even when the cluster has no other online members.
    */
-  private boolean sendWithNoMembers;
+  private final boolean sendWithNoMembers;
 
   /**
    * The current minAcked packetId processed by the managerThread.
@@ -143,7 +143,7 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
   /**
    * The max time we go without sending any packets.
    */
-  private int lastSendTimeFreqMillis;
+  private final int lastSendTimeFreqMillis;
 
   /**
    * The last time the cluster status was logged.
@@ -153,7 +153,7 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
   /**
    * The max time we go before logging the cluster status.
    */
-  private int lastStatusTimeFreqMillis;
+  private final int lastStatusTimeFreqMillis;
 
 
   private long totalTxnEventsSent;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastListener.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastListener.java
index ed32a7815..a5c7f3953 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastListener.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastListener.java
@@ -57,7 +57,7 @@ public class McastListener implements Runnable {
 
     private DatagramPacket pack;
 
-    private byte[] receiveBuffer;
+    private final byte[] receiveBuffer;
 
     private volatile boolean shutdown;
     private volatile boolean shutdownComplete;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/OutgoingPacketsAcked.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/OutgoingPacketsAcked.java
index 8e6d9c43b..7232913c7 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/OutgoingPacketsAcked.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/OutgoingPacketsAcked.java
@@ -7,7 +7,7 @@ public class OutgoingPacketsAcked {
 
     private long minimumGotAllPacketId;
 
-    private Map<String, GroupMemberAck> recievedByMap = new HashMap<String, GroupMemberAck>();
+    private final Map<String, GroupMemberAck> recievedByMap = new HashMap<String, GroupMemberAck>();
 
     public int getGroupSize() {
         synchronized (this) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/InternString.java b/src/main/java/com/avaje/ebeaninternal/server/core/InternString.java
index 015f7317f..a9ee3282e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/InternString.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/InternString.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
  */
 public final class InternString {
 
-	private static HashMap<String,String> map = new HashMap<String,String>();
+	private static final HashMap<String,String> map = new HashMap<String,String>();
 	
 	
 	/**
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java
index 8ce5761f1..9e0f1e55f 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java
@@ -37,7 +37,7 @@ public class DRawSqlSelectBuilder {
 	private int placeHolderAndWhere;
 	private int placeHolderHaving;
 	private int placeHolderAndHaving;
-	private boolean hasPlaceHolders;
+	private final boolean hasPlaceHolders;
 
 	private int selectPos = -1;
 	private int fromPos = -1;
@@ -51,7 +51,7 @@ public class DRawSqlSelectBuilder {
 	private boolean havingExprAnd;
 	private int havingExprPos = -1;
 
-	private String tableAlias;
+	private final String tableAlias;
 	
 	public DRawSqlSelectBuilder(NamingConvention namingConvention, BeanDescriptor<?> desc, DRawSqlMeta sqlSelectMeta) {
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ManyType.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/ManyType.java
index 9637aca2c..aa18657d4 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ManyType.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/ManyType.java
@@ -21,7 +21,7 @@ public class ManyType {
     SET(Set.class),
     MAP(null);
 
-    Class<? extends Collection> type;
+    final Class<? extends Collection> type;
 
     Underlying(Class<? extends Collection> type) {
       this.type = type;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
index 841ec21e2..fe9c5b37b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
@@ -19,7 +19,7 @@ public class InsertTimestampFactory {
 
 	final GeneratedInsertLong longTime = new GeneratedInsertLong();
 
-  Map<Class<?>, GeneratedProperty> map = new HashMap<Class<?>, GeneratedProperty>();
+  final Map<Class<?>, GeneratedProperty> map = new HashMap<Class<?>, GeneratedProperty>();
 
   public InsertTimestampFactory() {
     map.put(Timestamp.class, new GeneratedInsertTimestamp());
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index e7622bf8b..b59a00400 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -99,13 +99,13 @@ public class DeployBeanDescriptor<T> {
   /**
    * The EntityBean type used to create new EntityBeans.
    */
-  private Class<T> beanType;
+  private final Class<T> beanType;
 
-  private List<BeanPersistController> persistControllers = new ArrayList<BeanPersistController>(2);
-  private List<BeanPersistListener> persistListeners = new ArrayList<BeanPersistListener>(2);
-  private List<BeanQueryAdapter> queryAdapters = new ArrayList<BeanQueryAdapter>(2);
+  private final List<BeanPersistController> persistControllers = new ArrayList<BeanPersistController>(2);
+  private final List<BeanPersistListener> persistListeners = new ArrayList<BeanPersistListener>(2);
+  private final List<BeanQueryAdapter> queryAdapters = new ArrayList<BeanQueryAdapter>(2);
 
-  private CacheOptions cacheOptions = new CacheOptions();
+  private final CacheOptions cacheOptions = new CacheOptions();
 
   /**
    * If set overrides the find implementation. Server side only.
@@ -115,7 +115,7 @@ public class DeployBeanDescriptor<T> {
   /**
    * The table joins for this bean. Server side only.
    */
-  private ArrayList<DeployTableJoin> tableJoinList = new ArrayList<DeployTableJoin>(2);
+  private final ArrayList<DeployTableJoin> tableJoinList = new ArrayList<DeployTableJoin>(2);
 
   /**
    * Inheritance information. Server side only.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java
index 8410c9c87..f8b2cb6ce 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java
@@ -15,7 +15,7 @@ public class DeployBeanEmbedded {
 	/**
 	 * A map of property names to dbColumns.
 	 */
-	Map<String,String> propMap = new HashMap<String, String>();
+  final Map<String,String> propMap = new HashMap<String, String>();
 	
 	/**
 	 * Set a property name to use a specific dbColumn.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index a19462738..ce4b0c690 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -162,7 +162,7 @@ public class DeployBeanProperty {
   /**
    * The bean type.
    */
-  private Class<?> propertyType;
+  private final Class<?> propertyType;
 
   /**
    * Set for Non-JDBC types to provide logical to db type conversion.
@@ -190,7 +190,7 @@ public class DeployBeanProperty {
   /**
    * Extra deployment parameters.
    */
-  private HashMap<String, String> extraAttributeMap = new HashMap<String, String>();
+  private final HashMap<String, String> extraAttributeMap = new HashMap<String, String>();
 
   /**
    * The method used to read the property.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
index 5e7f1c059..7e80eb07c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java
@@ -16,7 +16,7 @@ public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
 	/**
 	 * Persist settings.
 	 */
-	BeanCascadeInfo cascadeInfo = new BeanCascadeInfo();
+  final BeanCascadeInfo cascadeInfo = new BeanCascadeInfo();
 
 	/**
 	 * The join table information.
@@ -26,7 +26,7 @@ public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
 	/**
 	 * Join between the beans.
 	 */
-	DeployTableJoin tableJoin = new DeployTableJoin();
+  final DeployTableJoin tableJoin = new DeployTableJoin();
 
 	/**
 	 * Whether the associated join type should be an outer join.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
index 2fd7245ea..0fce29f55 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
@@ -38,7 +38,7 @@ public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
 	/**
 	 * The type of the many, set, list or map.
 	 */
-	ManyType manyType;
+  final ManyType manyType;
 
 	/**
 	 * Create this property.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java
index 722035528..dd7901965 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java
@@ -36,7 +36,7 @@ public class DeployTableJoin {
   /**
    * The list of properties mapped to this joined table.
    */
-  private ArrayList<DeployBeanProperty> properties = new ArrayList<DeployBeanProperty>();
+  private final ArrayList<DeployBeanProperty> properties = new ArrayList<DeployBeanProperty>();
 
   /**
    * The list of join column pairs. Used to generate the on clause.
@@ -46,7 +46,7 @@ public class DeployTableJoin {
   /**
    * The persist cascade info.
    */
-  private BeanCascadeInfo cascadeInfo = new BeanCascadeInfo();
+  private final BeanCascadeInfo cascadeInfo = new BeanCascadeInfo();
 
   private InheritInfo inheritInfo;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
index e46d4dc49..75d0b9757 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java
@@ -20,9 +20,9 @@ public class DeployTableJoinColumn {
 	 */
 	String foreignDbColumn;
 
-	boolean insertable;
-	
-	boolean updateable;
+  final boolean insertable;
+
+  final boolean updateable;
 	
 	/**
 	 * Construct when automatically determining the join.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
index 95df113f8..aa34cb876 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
@@ -28,11 +28,11 @@ public class DeployInheritInfo {
 
 	private String discriminatorWhere;
 
-	private Class<?> type;
+	private final Class<?> type;
 
 	private Class<?> parent;
     
-	private ArrayList<DeployInheritInfo> children = new ArrayList<DeployInheritInfo>();
+	private final ArrayList<DeployInheritInfo> children = new ArrayList<DeployInheritInfo>();
         
     /**
      * Create for a given type.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java
index 6e7ec56ce..35065862a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java
@@ -15,7 +15,7 @@ public final class ElFilter<T> implements Filter<T>  {
 
 	private final BeanDescriptor<T> beanDescriptor;
 	
-	private ArrayList<ElMatcher<T>> matches = new ArrayList<ElMatcher<T>>();
+	private final ArrayList<ElMatcher<T>> matches = new ArrayList<ElMatcher<T>>();
 
 	private int maxRows;
 	
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExprPath.java b/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExprPath.java
index 088f7355f..e13f027bc 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExprPath.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExprPath.java
@@ -16,7 +16,7 @@ public class FilterExprPath implements Serializable {
   /**
    * The path of the filterMany.
    */
-  private String path;
+  private final String path;
 
   public FilterExprPath(String path) {
     this.path = path;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceContent.java b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceContent.java
index 6ed1d1561..c7122a177 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceContent.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceContent.java
@@ -14,9 +14,9 @@ public class FileResourceContent implements ResourceContent {
     /**
      * The underlying file.
      */
-    File file;
+    final File file;
 
-    String entryName;
+  final String entryName;
 
     /**
      * Create with a File and the entryName.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceSource.java b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceSource.java
index 267037998..1d65aef1d 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceSource.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceSource.java
@@ -10,9 +10,9 @@ public class FileResourceSource extends AbstractResourceSource implements Resour
     /**
      * The directory name.
      */
-    String directory;
-    
-    String baseDir;
+    final String directory;
+
+  final String baseDir;
         
     /**
      * Create the source based on a directory name.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/Dnode.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/Dnode.java
index 8b7a0da73..db461edf5 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/Dnode.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/Dnode.java
@@ -27,7 +27,7 @@ public class Dnode {
 
 	ArrayList<Dnode> children;
 
-	LinkedHashMap<String, String> attrList = new LinkedHashMap<String, String>();
+  final LinkedHashMap<String, String> attrList = new LinkedHashMap<String, String>();
 
 	/**
 	 * Create a node.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/DnodeParser.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/DnodeParser.java
index 736e515bb..04c902118 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/DnodeParser.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/DnodeParser.java
@@ -29,7 +29,7 @@ public class DnodeParser extends DefaultHandler {
     /**
      * Used to stack the nodes.
      */
-    Stack<Dnode> stack = new Stack<Dnode>();
+    final Stack<Dnode> stack = new Stack<Dnode>();
 
     /**
      * The class used to construct new nodes. Should be Dnode or a subtype of
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailAddress.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailAddress.java
index e826cda6b..de0f1f600 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailAddress.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailAddress.java
@@ -5,10 +5,10 @@ package com.avaje.ebeaninternal.server.lib.util;
  */
 public class MailAddress {
 
-    
-    String alias;
-    
-    String emailAddress;
+
+  final String alias;
+
+  final String emailAddress;
     
     /**
      * Create an address with an optional alias.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailEvent.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailEvent.java
index 59ef0a1e6..1bd4a5221 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailEvent.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailEvent.java
@@ -9,12 +9,12 @@ public class MailEvent {
     /**
      * The error indicating a send failure.
      */
-    Throwable error;
+    final Throwable error;
     
     /**
      * The message that was sent.
      */
-    MailMessage message;
+    final MailMessage message;
     
     
     /**
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailMessage.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailMessage.java
index 0ad5d214b..705c072cf 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailMessage.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailMessage.java
@@ -10,16 +10,11 @@ import java.util.List;
  * A simple test message that can be sent via smtp.
  */
 public class MailMessage {
-    
-//    /**
-//     * The subject text.
-//     */
-//    String subject;
 
     /**
      * The body content.
      */
-    ArrayList<String> bodylines; 
+    final ArrayList<String> bodylines;
 
     /**
      * The sender email address.
@@ -29,7 +24,7 @@ public class MailMessage {
     /**
      * The headers.
      */
-    HashMap<String,String> header = new HashMap<String, String>();
+    final HashMap<String,String> header = new HashMap<String, String>();
 
     /**
      * the recipient of the email.
@@ -39,7 +34,7 @@ public class MailMessage {
     /**
      * The list of recipients.
      */
-    ArrayList<MailAddress> recipientList = new ArrayList<MailAddress>();
+    final ArrayList<MailAddress> recipientList = new ArrayList<MailAddress>();
     
     /**
      * Create the message.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailSender.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailSender.java
index c64f64696..6367a45d0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailSender.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailSender.java
@@ -21,7 +21,7 @@ public class MailSender implements Runnable {
   int traceLevel = 0;
 
   Socket sserver;
-  String server;
+  final String server;
 
   BufferedReader in;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MapFromString.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MapFromString.java
index a98ee19c0..8d8c350eb 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MapFromString.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MapFromString.java
@@ -6,8 +6,8 @@ import java.util.LinkedHashMap;
  * Utility String class that supports String manipulation functions. 
  */
 public class MapFromString {
-    
-    LinkedHashMap<String,String> map = new LinkedHashMap<String,String>();
+
+  final LinkedHashMap<String,String> map = new LinkedHashMap<String,String>();
     
     String mapToString;
         
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MimeTypeHelper.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MimeTypeHelper.java
index 7d0e59fb0..a265f213e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MimeTypeHelper.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MimeTypeHelper.java
@@ -34,7 +34,7 @@ public class MimeTypeHelper {
 
 	}
 
-	private static ResourceBundle resources = ResourceBundle.getBundle("com.avaje.lib.util.mimetypes");
+	private static final ResourceBundle resources = ResourceBundle.getBundle("com.avaje.lib.util.mimetypes");
 
 
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java
index 1cfad0bac..78f6e7fb0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java
@@ -38,7 +38,7 @@ public class DefaultSqlRow implements SqlRow {
     /**
      * The underlying map of property data.
      */
-    Map<String, Object> map;
+    final Map<String, Object> map;
 
     /**
      * Create with a specific Map implementation.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
index 3bb1287f6..45cc6226a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java
@@ -9,7 +9,7 @@ import com.avaje.ebeaninternal.server.transaction.TransactionMap.State;
  */
 public final class DefaultTransactionThreadLocal {
 
-  private static ThreadLocal<TransactionMap> local = new ThreadLocal<TransactionMap>() {
+  private static final ThreadLocal<TransactionMap> local = new ThreadLocal<TransactionMap>() {
     protected synchronized TransactionMap initialValue() {
       return new TransactionMap();
     }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/JtaTransaction.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/JtaTransaction.java
index 9049dc567..1bdb2411b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/JtaTransaction.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/JtaTransaction.java
@@ -12,12 +12,11 @@ import javax.transaction.UserTransaction;
  */
 public class JtaTransaction extends JdbcTransaction {
 
-    private UserTransaction userTransaction;
+    private final UserTransaction userTransaction;
 
-    private boolean commmitted = false;
-
-    private boolean newTransaction = false;
+    private boolean commmitted;
 
+    private boolean newTransaction;
 
     /**
      * Create the JtaTransaction.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ImmutableCompoundTypeBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/type/ImmutableCompoundTypeBuilder.java
index 37b337fbd..c9b170a03 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ImmutableCompoundTypeBuilder.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ImmutableCompoundTypeBuilder.java
@@ -16,13 +16,13 @@ import java.util.Map;
  */
 public final class ImmutableCompoundTypeBuilder {
 
-    private static ThreadLocal<ImmutableCompoundTypeBuilder> local = new ThreadLocal<ImmutableCompoundTypeBuilder>() {
+    private static final ThreadLocal<ImmutableCompoundTypeBuilder> local = new ThreadLocal<ImmutableCompoundTypeBuilder>() {
         protected synchronized ImmutableCompoundTypeBuilder initialValue() {
             return new ImmutableCompoundTypeBuilder();
         }
     };
 
-    private Map<Class<?>, Entry> entryMap = new HashMap<Class<?>, Entry>();
+    private final Map<Class<?>, Entry> entryMap = new HashMap<Class<?>, Entry>();
 
     /**
      * Clear the cache of partial compound objects.
diff --git a/src/main/java/com/avaje/ebeaninternal/util/FilterExpressionList.java b/src/main/java/com/avaje/ebeaninternal/util/FilterExpressionList.java
index 5f9316b89..822f877bc 100644
--- a/src/main/java/com/avaje/ebeaninternal/util/FilterExpressionList.java
+++ b/src/main/java/com/avaje/ebeaninternal/util/FilterExpressionList.java
@@ -38,7 +38,7 @@ public class FilterExpressionList<T> extends DefaultExpressionList<T> {
     return pathPrefix;
   }
 
-  private String notAllowedMessage = "This method is not allowed on a filter";
+  private final String notAllowedMessage = "This method is not allowed on a filter";
 
   @Override
   public ExpressionList<T> filterMany(String prop) {