diff --git a/cavis-datavec/cavis-datavec-api/src/main/java/org/datavec/api/transform/analysis/columns/NumericalColumnAnalysis.java b/cavis-datavec/cavis-datavec-api/src/main/java/org/datavec/api/transform/analysis/columns/NumericalColumnAnalysis.java
index 14a727274..c814d2b73 100644
--- a/cavis-datavec/cavis-datavec-api/src/main/java/org/datavec/api/transform/analysis/columns/NumericalColumnAnalysis.java
+++ b/cavis-datavec/cavis-datavec-api/src/main/java/org/datavec/api/transform/analysis/columns/NumericalColumnAnalysis.java
@@ -90,7 +90,7 @@ public abstract class NumericalColumnAnalysis implements ColumnAnalysis {
     public abstract double getMaxDouble();
 
     @SuppressWarnings("unchecked")
-    public abstract static class Builder<T extends Builder<T>> {
+    public static abstract class Builder<T extends Builder<T>> {
         protected double mean;
         protected double sampleStdev;
         protected double sampleVariance;
diff --git a/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/autodiff/samediff/internal/InferenceSession.java b/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/autodiff/samediff/internal/InferenceSession.java
index 8d3b414ab..f7abdc755 100644
--- a/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/autodiff/samediff/internal/InferenceSession.java
+++ b/cavis-dnn/cavis-dnn-api/src/main/java/org/nd4j/autodiff/samediff/internal/InferenceSession.java
@@ -970,7 +970,7 @@ public class InferenceSession extends AbstractSession<INDArray, Pair<SameDiffOp,
     }
 
     @Data
-    public abstract static class Dep {
+    public static abstract class Dep {
         protected String frame;
         protected FrameIter parentFrame;
     }
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetBaseBuilderConfiguration.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetBaseBuilderConfiguration.java
index f7111b153..bb6d0c44a 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetBaseBuilderConfiguration.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetBaseBuilderConfiguration.java
@@ -555,7 +555,7 @@ public abstract class NeuralNetBaseBuilderConfiguration implements INeuralNetwor
     return clone;
   }
 
-  public abstract static class NeuralNetBaseBuilderConfigurationBuilder<
+  public static abstract class NeuralNetBaseBuilderConfigurationBuilder<
       C extends NeuralNetBaseBuilderConfiguration,
       B extends NeuralNetBaseBuilderConfiguration.NeuralNetBaseBuilderConfigurationBuilder<C, B>> {
 
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ActivationLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ActivationLayer.java
index 48aaacded..bdb0c9ff3 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ActivationLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ActivationLayer.java
@@ -133,7 +133,7 @@ public class ActivationLayer extends NoParamLayer {
     // No op
   }
 
-  public abstract static class ActivationLayerBuilder<
+  public static abstract class ActivationLayerBuilder<
           C extends ActivationLayer, B extends ActivationLayerBuilder<C, B>>
       extends NoParamLayerBuilder<C, B> {
     public C build() {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/BaseLayerConfiguration.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/BaseLayerConfiguration.java
index a5d441dfa..c923f4293 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/BaseLayerConfiguration.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/BaseLayerConfiguration.java
@@ -202,7 +202,7 @@ public abstract class BaseLayerConfiguration extends LayerConfiguration
 
   }
 
-  public abstract static class BaseLayerConfigurationBuilder<
+  public static abstract class BaseLayerConfigurationBuilder<
           C extends BaseLayerConfiguration, B extends BaseLayerConfigurationBuilder<C, B>>
       extends LayerConfigurationBuilder<C, B> {
 
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Cnn3DLossLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Cnn3DLossLayer.java
index 0f0dae91f..bba4396a6 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Cnn3DLossLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Cnn3DLossLayer.java
@@ -114,7 +114,7 @@ public class Cnn3DLossLayer extends FeedForwardLayer {
     // No op
   }
 
-  public abstract static class Cnn3DLossLayerBuilder<
+  public static abstract class Cnn3DLossLayerBuilder<
           C extends Cnn3DLossLayer, B extends Cnn3DLossLayerBuilder<C, B>>
       extends FeedForwardLayerBuilder<C, B> {
 
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Convolution1DLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Convolution1DLayer.java
index ecbba495e..a0c2ad6e5 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Convolution1DLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Convolution1DLayer.java
@@ -184,7 +184,7 @@ public class Convolution1DLayer extends ConvolutionLayer {
     return true;
   }
 
-  public abstract static class Convolution1DLayerBuilder<
+  public static abstract class Convolution1DLayerBuilder<
           C extends ConvolutionLayer, B extends Convolution1DLayerBuilder<C, B>>
       extends ConvolutionLayerBuilder<C, B> {
     public C build() {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Convolution3D.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Convolution3D.java
index 086fcb677..49362063a 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Convolution3D.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Convolution3D.java
@@ -238,7 +238,7 @@ public class Convolution3D extends ConvolutionLayer {
 
   // public Builder(int[] kernelSize, int[] stride, int[] padding, int[] dilation) {
   // sup/er(kernelSize, stride, padding, dilation, 3);
-  public abstract static class Convolution3DBuilder<
+  public static abstract class Convolution3DBuilder<
           C extends Convolution3D, B extends Convolution3DBuilder<C, B>>
       extends ConvolutionLayer.ConvolutionLayerBuilder<C, B> {
     public C build() {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ConvolutionLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ConvolutionLayer.java
index 8aaea0d98..d4d1093f6 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ConvolutionLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ConvolutionLayer.java
@@ -355,7 +355,7 @@ public class ConvolutionLayer extends FeedForwardLayer {
   }
 
 
-  public abstract static class ConvolutionLayerBuilder<
+  public static abstract class ConvolutionLayerBuilder<
           C extends ConvolutionLayer, B extends ConvolutionLayerBuilder<C, B>>
       extends FeedForwardLayerBuilder<C, B> {
 
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Deconvolution3D.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Deconvolution3D.java
index 22ade1c86..5ea7d4465 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Deconvolution3D.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Deconvolution3D.java
@@ -164,7 +164,7 @@ public class Deconvolution3D extends ConvolutionLayer {
   //private int[] padding;
   //private int[] dilation;
 
-  public abstract static class Deconvolution3DBuilder<
+  public static abstract class Deconvolution3DBuilder<
           C extends Deconvolution3D, B extends Deconvolution3DBuilder<C, B>>
       extends ConvolutionLayerBuilder<C, B> {
     public C build() {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/DropoutLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/DropoutLayer.java
index a7d85f10e..18cb5e23c 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/DropoutLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/DropoutLayer.java
@@ -147,7 +147,7 @@ public class DropoutLayer extends FeedForwardLayer {
         .build();
   }
 
-  public abstract static class DropoutLayerBuilder<
+  public static abstract class DropoutLayerBuilder<
           C extends DropoutLayer, B extends DropoutLayerBuilder<C, B>>
       extends FeedForwardLayerBuilder<C, B> {
 
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LearnedSelfAttentionLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LearnedSelfAttentionLayer.java
index f56dc79ee..d7fa4ea3a 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LearnedSelfAttentionLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LearnedSelfAttentionLayer.java
@@ -173,7 +173,7 @@ public class LearnedSelfAttentionLayer extends SameDiffLayer {
     return null;
   }
 
-  public abstract static class LearnedSelfAttentionLayerBuilder<
+  public static abstract class LearnedSelfAttentionLayerBuilder<
           C extends LearnedSelfAttentionLayer, B extends LearnedSelfAttentionLayerBuilder<C, B>>
       extends SameDiffLayerBuilder<C, B> {
     public C build() {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocalResponseNormalization.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocalResponseNormalization.java
index d73f2e846..1cf360e03 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocalResponseNormalization.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocalResponseNormalization.java
@@ -175,7 +175,7 @@ public class LocalResponseNormalization extends LayerConfiguration {
         .build();
   }
 
-  public abstract static class LocalResponseNormalizationBuilder<
+  public static abstract class LocalResponseNormalizationBuilder<
           C extends LocalResponseNormalization, B extends LocalResponseNormalizationBuilder<C, B>>
       extends LayerConfigurationBuilder<C, B> {
     public B helperAllowFallback(boolean b) {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected2D.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected2D.java
index 2d5b448a5..aa9d4e77d 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected2D.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LocallyConnected2D.java
@@ -319,7 +319,7 @@ public class LocallyConnected2D extends SameDiffLayer {
     }
   }
 
-  public abstract static class LocallyConnected2DBuilder<
+  public static abstract class LocallyConnected2DBuilder<
           C extends LocallyConnected2D, B extends LocallyConnected2DBuilder<C, B>>
       extends SameDiffLayerBuilder<C, B> {
     public C build() {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LossLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LossLayer.java
index afacf9b9f..8855f7223 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LossLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/LossLayer.java
@@ -92,7 +92,7 @@ public class LossLayer extends FeedForwardLayer {
     return EmptyParamInitializer.getInstance();
   }
 
-  public abstract static class LossLayerBuilder<
+  public static abstract class LossLayerBuilder<
           C extends LossLayer, B extends LossLayerBuilder<C, B>>
       extends FeedForwardLayerBuilder<C, B> {
     @Override
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/OutputLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/OutputLayer.java
index 851d97a32..b08ee76b3 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/OutputLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/OutputLayer.java
@@ -83,7 +83,7 @@ public class OutputLayer extends BaseOutputLayer {
     return DefaultParamInitializer.getInstance();
   }
 
-  public abstract static class OutputLayerBuilder<
+  public static abstract class OutputLayerBuilder<
           C extends OutputLayer, B extends OutputLayerBuilder<C, B>>
       extends BaseOutputLayerBuilder<C, B> {
     public C build() {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PReLULayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PReLULayer.java
index 93f126130..d0a2ed62e 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PReLULayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PReLULayer.java
@@ -130,7 +130,7 @@ public class PReLULayer extends BaseLayerConfiguration {
         .build();
   }
 
-  public abstract static class PReLULayerBuilder<
+  public static abstract class PReLULayerBuilder<
           C extends PReLULayer, B extends PReLULayerBuilder<C, B>>
       extends BaseLayerConfigurationBuilder<C, B> {
     public C build() {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PrimaryCapsules.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PrimaryCapsules.java
index 9edb50322..c5365c7ab 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PrimaryCapsules.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/PrimaryCapsules.java
@@ -336,7 +336,7 @@ public class PrimaryCapsules extends SameDiffLayer {
     }
   }
 
-  public abstract static class PrimaryCapsulesBuilder<
+  public static abstract class PrimaryCapsulesBuilder<
           C extends PrimaryCapsules, B extends PrimaryCapsulesBuilder<C, B>>
       extends SameDiffLayerBuilder<C, B> {
 
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/RnnLossLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/RnnLossLayer.java
index edf2f27c6..a17a20f69 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/RnnLossLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/RnnLossLayer.java
@@ -120,7 +120,7 @@ public class RnnLossLayer extends FeedForwardLayer {
     // No op
   }
 
-  public abstract static class RnnLossLayerBuilder<
+  public static abstract class RnnLossLayerBuilder<
           C extends RnnLossLayer, B extends RnnLossLayerBuilder<C, B>>
       extends FeedForwardLayerBuilder<C, B> {
     @Override
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SelfAttentionLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SelfAttentionLayer.java
index 2f399d5e1..0aeb128dd 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SelfAttentionLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SelfAttentionLayer.java
@@ -145,7 +145,7 @@ public class SelfAttentionLayer extends SameDiffLayer {
     }
   }
 
-  public abstract static class SelfAttentionLayerBuilder<
+  public static abstract class SelfAttentionLayerBuilder<
           C extends SelfAttentionLayer, B extends SelfAttentionLayerBuilder<C, B>>
       extends SameDiffLayerBuilder<C, B> {
     public C build() {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SeparableConvolution2D.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SeparableConvolution2D.java
index c6ed235ab..d06a090b5 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SeparableConvolution2D.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SeparableConvolution2D.java
@@ -177,7 +177,7 @@ public class SeparableConvolution2D extends ConvolutionLayer {
         SeparableConvolution2DLayer.class);
   }
 
-  public abstract static class SeparableConvolution2DBuilder<
+  public static abstract class SeparableConvolution2DBuilder<
           C extends SeparableConvolution2D, B extends SeparableConvolution2DBuilder<C, B>>
       extends ConvolutionLayerBuilder<C, B> {
     public C build() {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SpaceToBatchLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SpaceToBatchLayer.java
index 88a7b2444..79ec98a49 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SpaceToBatchLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SpaceToBatchLayer.java
@@ -170,7 +170,7 @@ public class SpaceToBatchLayer extends NoParamLayer {
     throw new UnsupportedOperationException("SpaceToBatchLayer does not contain parameters");
   }
 
-  public abstract static class SpaceToBatchLayerBuilder<
+  public static abstract class SpaceToBatchLayerBuilder<
           C extends SpaceToBatchLayer, B extends SpaceToBatchLayerBuilder<C, B>>
       extends NoParamLayerBuilder<C, B> {
     /**
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Subsampling3DLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Subsampling3DLayer.java
index 03838bd21..98f1020de 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Subsampling3DLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/Subsampling3DLayer.java
@@ -281,7 +281,7 @@ public class Subsampling3DLayer extends NoParamLayer {
     }
   }
 
-  public abstract static class Subsampling3DLayerBuilder<
+  public static abstract class Subsampling3DLayerBuilder<
           C extends Subsampling3DLayer, B extends Subsampling3DLayerBuilder<C, B>>
       extends NoParamLayerBuilder<C, B> {
 
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java
index a41dcd4a7..cfc5b7c2f 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java
@@ -385,7 +385,7 @@ public class SubsamplingLayer extends NoParamLayer {
     }
   }
 
-  public abstract static class SubsamplingLayerBuilder<
+  public static abstract class SubsamplingLayerBuilder<
           C extends SubsamplingLayer, B extends SubsamplingLayerBuilder<C, B>>
       extends NoParamLayerBuilder<C, B> {
 
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ZeroPadding1DLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ZeroPadding1DLayer.java
index 174efaf98..66a5ac114 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ZeroPadding1DLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/ZeroPadding1DLayer.java
@@ -138,7 +138,7 @@ public class ZeroPadding1DLayer extends NoParamLayer {
         .build();
   }
 
-  public abstract static class ZeroPadding1DLayerBuilder<
+  public static abstract class ZeroPadding1DLayerBuilder<
           C extends ZeroPadding1DLayer, B extends ZeroPadding1DLayerBuilder<C, B>>
       extends NoParamLayerBuilder<C, B> {
     public B padding(int... padding) {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping1D.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping1D.java
index 3ac6620d5..161851952 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping1D.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping1D.java
@@ -119,7 +119,7 @@ public class Cropping1D extends NoParamLayer {
     return null;
   }
 
-  public abstract static class Cropping1DBuilder<
+  public static abstract class Cropping1DBuilder<
           C extends Cropping1D, B extends Cropping1DBuilder<C, B>>
       extends NoParamLayerBuilder<C, B> {
     public B cropping(int... cropping) {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping2D.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping2D.java
index ef2edcef2..8582874ed 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping2D.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/convolutional/Cropping2D.java
@@ -139,7 +139,7 @@ public class Cropping2D extends NoParamLayer {
     this.dataFormat = ((InputType.InputTypeConvolutional) inputType).getFormat();
   }
 
-  public abstract static class Cropping2DBuilder<
+  public static abstract class Cropping2DBuilder<
           C extends Cropping2D, B extends Cropping2DBuilder<C, B>>
       extends NoParamLayerBuilder<C, B> {
     public B cropping(int... cropping) {
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/AbstractSameDiffLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/AbstractSameDiffLayer.java
index 86a8038dc..335a494d1 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/AbstractSameDiffLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/samediff/AbstractSameDiffLayer.java
@@ -245,7 +245,7 @@ public abstract class AbstractSameDiffLayer extends LayerConfiguration {
     }
   }
 
-  public abstract static class AbstractSameDiffLayerBuilder<
+  public static abstract class AbstractSameDiffLayerBuilder<
           C extends AbstractSameDiffLayer, B extends AbstractSameDiffLayerBuilder<C, B>>
       extends LayerConfigurationBuilder<C, B> {
     /**
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/variational/VariationalAutoencoder.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/variational/VariationalAutoencoder.java
index 0c4419a76..dce47df77 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/variational/VariationalAutoencoder.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/variational/VariationalAutoencoder.java
@@ -176,7 +176,7 @@ public class VariationalAutoencoder extends BasePretrainNetwork {
         .build();
   }
 
-  public abstract static class VariationalAutoencoderBuilder<
+  public static abstract class VariationalAutoencoderBuilder<
           C extends VariationalAutoencoder, B extends VariationalAutoencoderBuilder<C, B>>
       extends BasePretrainNetworkBuilder<C, B> {
 
diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/ocnn/OCNNOutputLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/ocnn/OCNNOutputLayer.java
index b4ac6ca41..023668c19 100644
--- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/ocnn/OCNNOutputLayer.java
+++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/ocnn/OCNNOutputLayer.java
@@ -120,7 +120,7 @@ public class OCNNOutputLayer extends BaseOutputLayer {
     return null;
   }
 
-  public abstract static class OCNNOutputLayerBuilder<
+  public static abstract class OCNNOutputLayerBuilder<
           C extends OCNNOutputLayer, B extends OCNNOutputLayerBuilder<C, B>>
       extends BaseOutputLayerBuilder<C, B> {