diff --git a/cavis-common-platform/build.gradle b/cavis-common-platform/build.gradle
index a48daab7b..7e0c7279f 100644
--- a/cavis-common-platform/build.gradle
+++ b/cavis-common-platform/build.gradle
@@ -47,7 +47,6 @@ dependencies {
         api "com.google.code.gson:gson:2.8.6"
         api "com.google.protobuf:protobuf-java-util:3.15.6"
         api "com.google.flatbuffers:flatbuffers-java:${flatbuffers.version}"
-        api "com.google.flatbuffers:flatbuffers-java:${flatbuffers.version}"
 
         /*
         api "com.fasterxml.jackson.core:jackson-core:${jackson.version}"
diff --git a/cavis-datavec/cavis-datavec-data/cavis-datavec-data-geo/src/main/java/org/datavec/api/transform/transform/geo/CoordinatesDistanceTransform.java b/cavis-datavec/cavis-datavec-data/cavis-datavec-data-geo/src/main/java/org/datavec/api/transform/transform/geo/CoordinatesDistanceTransform.java
index 4595abf1a..9df491dcf 100644
--- a/cavis-datavec/cavis-datavec-data/cavis-datavec-data-geo/src/main/java/org/datavec/api/transform/transform/geo/CoordinatesDistanceTransform.java
+++ b/cavis-datavec/cavis-datavec-data/cavis-datavec-data-geo/src/main/java/org/datavec/api/transform/transform/geo/CoordinatesDistanceTransform.java
@@ -1,18 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2015-2018 Skymind, Inc.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License, Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- ******************************************************************************/
 
 package org.datavec.api.transform.transform.geo;
 
diff --git a/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/autodiff/execution/Node.java b/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/autodiff/execution/Node.java
index ceb7e7e4c..638de7b58 100644
--- a/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/autodiff/execution/Node.java
+++ b/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/autodiff/execution/Node.java
@@ -31,7 +31,7 @@ import java.util.List;
 @Data
 @Slf4j
 @NoArgsConstructor
-@ToString(exclude = {"opExecAction"})
+@ToString
 public class Node {
     private int id;
     private String name;
diff --git a/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/BaseConvolutionConfig.java b/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/BaseConvolutionConfig.java
index 5a8f2ad48..a23e77bed 100644
--- a/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/BaseConvolutionConfig.java
+++ b/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/config/BaseConvolutionConfig.java
@@ -22,6 +22,7 @@ package org.nd4j.linalg.api.ops.impl.layers.convolution.config;
 
 import java.util.Map;
 
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.nd4j.linalg.exception.ND4JIllegalStateException;
@@ -29,6 +30,7 @@ import org.nd4j.linalg.exception.ND4JIllegalStateException;
 import java.lang.reflect.Field;
 
 @Slf4j
+@EqualsAndHashCode
 public abstract class BaseConvolutionConfig {
 
     public abstract Map<String, Object> toProperties();
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/BasePretrainNetwork.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/BasePretrainNetwork.java
index 8d958c3ec..2fdbffd07 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/BasePretrainNetwork.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/BasePretrainNetwork.java
@@ -27,8 +27,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @Data
 @NoArgsConstructor
-@ToString(callSuper = true, exclude = {"pretrain"})
-@EqualsAndHashCode(callSuper = true, exclude = {"pretrain"})
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties("pretrain")
 public abstract class BasePretrainNetwork extends FeedForwardLayer {
 
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/optimize/listeners/FailureTestingListener.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/optimize/listeners/FailureTestingListener.java
index 873311339..c05626511 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/optimize/listeners/FailureTestingListener.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/optimize/listeners/FailureTestingListener.java
@@ -22,6 +22,7 @@ package org.deeplearning4j.optimize.listeners;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.deeplearning4j.nn.api.Model;
@@ -135,6 +136,7 @@ public class FailureTestingListener implements TrainingListener, Serializable {
 
 
     @Data
+    @EqualsAndHashCode(callSuper = false)
     public static abstract class FailureTrigger implements Serializable {
 
         private boolean initialized = false;
@@ -198,6 +200,7 @@ public class FailureTestingListener implements TrainingListener, Serializable {
     }
 
     @Data
+    @EqualsAndHashCode(callSuper = false)
     public static class RandomProb extends FailureTrigger {
 
         private final CallType callType;
@@ -223,6 +226,7 @@ public class FailureTestingListener implements TrainingListener, Serializable {
 
 
     @Data
+    @EqualsAndHashCode(callSuper = false)
     public static class TimeSinceInitializedTrigger extends FailureTrigger {
 
         private final long msSinceInit;
@@ -245,6 +249,7 @@ public class FailureTestingListener implements TrainingListener, Serializable {
     }
 
     @Data
+    @EqualsAndHashCode(callSuper = false)
     public static class UserNameTrigger extends FailureTrigger {
         private final String userName;
         private boolean shouldFail = false;
@@ -268,6 +273,7 @@ public class FailureTestingListener implements TrainingListener, Serializable {
     //System.out.println("Hostname: " + InetAddress.getLocalHost().getHostName());
 
     @Data
+    @EqualsAndHashCode(callSuper = false)
     public static class HostNameTrigger extends FailureTrigger{
         private final String hostName;
         private boolean shouldFail = false;
@@ -296,6 +302,7 @@ public class FailureTestingListener implements TrainingListener, Serializable {
     }
 
     @Data
+    @EqualsAndHashCode(callSuper = false)
     public static class IterationEpochTrigger extends FailureTrigger {
 
         private final boolean isEpoch;
diff --git a/cavis-dnn/cavis-dnn-parallelwrapper-parameterserver/build.gradle b/cavis-dnn/cavis-dnn-parallelwrapper-parameterserver/build.gradle
index db7afeb4d..486ac0baa 100644
--- a/cavis-dnn/cavis-dnn-parallelwrapper-parameterserver/build.gradle
+++ b/cavis-dnn/cavis-dnn-parallelwrapper-parameterserver/build.gradle
@@ -34,10 +34,12 @@ dependencies {
     implementation projects.cavisDnn.cavisDnnData.cavisDnnDataUtilityIterators
 
     implementation 'org.scala-lang:scala-library'
-    implementation "io.aeron:aeron-all:1.32.0"
+    implementation 'io.aeron:aeron-all:1.39.0'
     implementation "org.slf4j:slf4j-api"
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    implementation "com.fasterxml.jackson.core:jackson-annotations"
 
     testImplementation 'ch.qos.logback:logback-classic'
     testImplementation projects.cavisDnn.cavisDnnCommonTests
     testImplementation projects.cavisDnn.cavisDnnData.cavisDnnDataDatasets
-}
\ No newline at end of file
+}
diff --git a/cavis-nd4j/cavis-nd4j-common-tests/src/main/java/org/nd4j/common/tests/BaseND4JTest.java b/cavis-nd4j/cavis-nd4j-common-tests/src/main/java/org/nd4j/common/tests/BaseND4JTest.java
index 937f46a9d..eda000426 100644
--- a/cavis-nd4j/cavis-nd4j-common-tests/src/main/java/org/nd4j/common/tests/BaseND4JTest.java
+++ b/cavis-nd4j/cavis-nd4j-common-tests/src/main/java/org/nd4j/common/tests/BaseND4JTest.java
@@ -21,7 +21,6 @@
 package org.nd4j.common.tests;
 
 
-import lombok.extern.log4j.Log4j2;
 import lombok.extern.slf4j.Slf4j;
 import org.bytedeco.javacpp.Pointer;
 import org.junit.jupiter.api.AfterEach;
@@ -132,7 +131,9 @@ public abstract class BaseND4JTest {
             System.out.println("Open workspace leaked from test! Exiting - " + currWS.getId() + ", isOpen = " + currWS.isScopeActive() + " - " + currWS);
             System.out.flush();
 
-            try{ Thread.sleep(1000); } catch (InterruptedException e){ }
+            try{ Thread.sleep(1000); } catch (InterruptedException e){
+                System.out.println(e.getMessage());
+            }
             System.exit(1);
         }