diff --git a/warehouse/core/src/main/java/datawave/data/hash/SnowflakeUID.java b/warehouse/core/src/main/java/datawave/data/hash/SnowflakeUID.java
index b5df2904da2..0b4fe9af872 100644
--- a/warehouse/core/src/main/java/datawave/data/hash/SnowflakeUID.java
+++ b/warehouse/core/src/main/java/datawave/data/hash/SnowflakeUID.java
@@ -5,7 +5,6 @@
 
 import java.io.DataInput;
 import java.io.IOException;
-import java.io.Serializable;
 import java.math.BigInteger;
 
 import org.apache.commons.lang.builder.CompareToBuilder;
diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/UniqueFields.java b/warehouse/query-core/src/main/java/datawave/query/attributes/UniqueFields.java
index 76c4983518e..3f377144fff 100644
--- a/warehouse/query-core/src/main/java/datawave/query/attributes/UniqueFields.java
+++ b/warehouse/query-core/src/main/java/datawave/query/attributes/UniqueFields.java
@@ -26,6 +26,7 @@
  * {@link UniqueFields#from(String)}.
  */
 public class UniqueFields implements Serializable {
+    private static final long serialVersionUID = 1l;
 
     private Multimap<String,UniqueGranularity> fieldMap;
 
diff --git a/warehouse/query-core/src/main/java/datawave/query/common/grouping/GroupFields.java b/warehouse/query-core/src/main/java/datawave/query/common/grouping/GroupFields.java
index c7dd7c9684b..71338f11bbe 100644
--- a/warehouse/query-core/src/main/java/datawave/query/common/grouping/GroupFields.java
+++ b/warehouse/query-core/src/main/java/datawave/query/common/grouping/GroupFields.java
@@ -30,6 +30,7 @@
  * {@link GroupFields#from(String)}.
  */
 public class GroupFields implements Serializable {
+    private static final long serialVersionUID = 1l;
 
     private static final String GROUP = "GROUP";
     private static final String SUM = "SUM";
diff --git a/warehouse/query-core/src/main/java/datawave/query/jexl/DatawaveInterpreter.java b/warehouse/query-core/src/main/java/datawave/query/jexl/DatawaveInterpreter.java
index 27d8461dcac..7456aa6cac2 100644
--- a/warehouse/query-core/src/main/java/datawave/query/jexl/DatawaveInterpreter.java
+++ b/warehouse/query-core/src/main/java/datawave/query/jexl/DatawaveInterpreter.java
@@ -148,7 +148,8 @@ public Object visit(ASTFunctionNode node, Object data) {
      *            the variable name
      * @param undef
      *            whether the variable is undefined or null
-     * @return
+     *
+     * @return null if it cannot be solved
      */
     @Override
     protected Object unsolvableVariable(JexlNode node, String var, boolean undef) {
@@ -168,7 +169,7 @@ protected Object unsolvableVariable(JexlNode node, String var, boolean undef) {
      *            the method/function name
      * @param xany
      *            the cause
-     * @return
+     * @return the JexlException
      */
     @Override
     protected JexlException invocationException(JexlNode node, String methodName, Throwable xany) {
diff --git a/warehouse/query-core/src/main/java/datawave/query/jexl/lookups/IndexLookupMap.java b/warehouse/query-core/src/main/java/datawave/query/jexl/lookups/IndexLookupMap.java
index 9b7eafc5e89..caab414d0e9 100644
--- a/warehouse/query-core/src/main/java/datawave/query/jexl/lookups/IndexLookupMap.java
+++ b/warehouse/query-core/src/main/java/datawave/query/jexl/lookups/IndexLookupMap.java
@@ -12,6 +12,7 @@
  */
 @SuppressWarnings("serial")
 public class IndexLookupMap implements Map<String,ValueSet>, Serializable {
+    private static final long serialVersionUID = 1l;
     private Set<String> patterns = new HashSet<>();
     private Map<String,ValueSet> index = new HashMap<>();
     private boolean exceededKeyThreshold = false;
diff --git a/warehouse/query-core/src/main/java/datawave/query/util/SortedKeyValueIteratorToIterator.java b/warehouse/query-core/src/main/java/datawave/query/util/SortedKeyValueIteratorToIterator.java
index f5d5aeae046..711af5c2139 100644
--- a/warehouse/query-core/src/main/java/datawave/query/util/SortedKeyValueIteratorToIterator.java
+++ b/warehouse/query-core/src/main/java/datawave/query/util/SortedKeyValueIteratorToIterator.java
@@ -81,6 +81,7 @@ private Map.Entry<Key,Value> findNext() {
     }
 
     public static class IteratorException extends RuntimeException implements Serializable {
+        private static final long serialVersionUID = 1l;
 
         public IteratorException() {
             super();
diff --git a/warehouse/ssdeep-common/src/main/java/datawave/util/ssdeep/SSDeepHashEditDistanceScorer.java b/warehouse/ssdeep-common/src/main/java/datawave/util/ssdeep/SSDeepHashEditDistanceScorer.java
index 06e49a254f0..cd04fa417b4 100644
--- a/warehouse/ssdeep-common/src/main/java/datawave/util/ssdeep/SSDeepHashEditDistanceScorer.java
+++ b/warehouse/ssdeep-common/src/main/java/datawave/util/ssdeep/SSDeepHashEditDistanceScorer.java
@@ -72,6 +72,15 @@ public int apply(SSDeepHash signature1, SSDeepHash signature2) {
     /**
      * This is the low level chunk scoring algorithm. It takes two chunks and scores them on a scale of 0-100 where 0 is a terrible match and 100 is a great
      * match. The chunkSize is used to cope with very small messages.
+     *
+     * @param s1
+     *            the first chunk
+     * @param s2
+     *            the second chunk
+     * @param chunkSize
+     *            size of the chunk
+     *
+     * @return the new score
      */
     private static int scoreChunks(final String s1, final String s2, final int chunkSize) {
         final int len1 = s1.length();
diff --git a/web-services/client/src/main/java/datawave/webservice/result/MetadataQueryResponseBase.java b/web-services/client/src/main/java/datawave/webservice/result/MetadataQueryResponseBase.java
index 597382cd5d2..7a8a5b50c72 100644
--- a/web-services/client/src/main/java/datawave/webservice/result/MetadataQueryResponseBase.java
+++ b/web-services/client/src/main/java/datawave/webservice/result/MetadataQueryResponseBase.java
@@ -7,6 +7,7 @@
 import io.protostuff.Message;
 
 public abstract class MetadataQueryResponseBase<T> extends BaseQueryResponse implements Serializable, TotalResultsAware, Message<T> {
+    private static final long serialVersionUID = 1l;
 
     public abstract List<MetadataFieldBase> getFields();
 
diff --git a/web-services/client/src/main/java/datawave/webservice/results/ingest/file/FileDetails.java b/web-services/client/src/main/java/datawave/webservice/results/ingest/file/FileDetails.java
index 2533c639df8..23e9b4389c1 100644
--- a/web-services/client/src/main/java/datawave/webservice/results/ingest/file/FileDetails.java
+++ b/web-services/client/src/main/java/datawave/webservice/results/ingest/file/FileDetails.java
@@ -16,6 +16,8 @@
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class FileDetails implements Serializable, Message<FileDetails> {
+
+    private static final long serialVersionUID = 1l;
     @XmlAttribute(name = "filePath")
     private String path;
     @XmlAttribute(name = "dateReceived")
diff --git a/web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryConfiguration.java b/web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryConfiguration.java
index e7bf6cc3a98..2c1a928904d 100644
--- a/web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryConfiguration.java
+++ b/web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryConfiguration.java
@@ -7,6 +7,7 @@
 import datawave.webservice.query.configuration.GenericQueryConfiguration;
 
 public class CompositeQueryConfiguration extends GenericQueryConfiguration implements Serializable {
+    private static final long serialVersionUID = 1l;
 
     private Query query = null;