diff --git a/common-parent/codegen/src/main/java/com/speedment/common/codegen/controller/FinalParameters.java b/common-parent/codegen/src/main/java/com/speedment/common/codegen/controller/FinalParameters.java
index b65b6cd5c5..a6ff65fe23 100644
--- a/common-parent/codegen/src/main/java/com/speedment/common/codegen/controller/FinalParameters.java
+++ b/common-parent/codegen/src/main/java/com/speedment/common/codegen/controller/FinalParameters.java
@@ -16,7 +16,6 @@
  */
 package com.speedment.common.codegen.controller;
 
-import com.speedment.common.codegen.model.modifier.Keyword;
 import com.speedment.common.codegen.model.trait.HasMethods;
 
 import java.util.function.Consumer;
@@ -41,7 +40,7 @@ public final class FinalParameters<T extends HasMethods<T>> implements Consumer<
 	public void accept(T model) {
 		requireNonNull(model).getMethods()
             .forEach(m -> m.getFields()
-                .forEach(Keyword.Final::final_)
+                .forEach(f -> f.final_())
             );
 	}
 }
\ No newline at end of file
diff --git a/common-parent/codegen/src/main/java/com/speedment/common/codegen/internal/java/view/ConstructorView.java b/common-parent/codegen/src/main/java/com/speedment/common/codegen/internal/java/view/ConstructorView.java
index 1795333627..1dd61bf06e 100644
--- a/common-parent/codegen/src/main/java/com/speedment/common/codegen/internal/java/view/ConstructorView.java
+++ b/common-parent/codegen/src/main/java/com/speedment/common/codegen/internal/java/view/ConstructorView.java
@@ -76,7 +76,7 @@ private static Optional<String> renderName(Generator gen, Constructor model) {
         return gen.getRenderStack()
             .fromTop(HasName.class)
             .filter(n -> model != n)
-            .map(HasName::getName)
+            .map(HasName<?>::getName)
             .map(Formatting::shortName)
             .findFirst();
 	}
diff --git a/generator-parent/generator-core/src/test/java/com/speedment/generator/SimpleModel.java b/generator-parent/generator-core/src/test/java/com/speedment/generator/SimpleModel.java
index f488ebdb91..937bbd82df 100644
--- a/generator-parent/generator-core/src/test/java/com/speedment/generator/SimpleModel.java
+++ b/generator-parent/generator-core/src/test/java/com/speedment/generator/SimpleModel.java
@@ -23,7 +23,6 @@
 import com.speedment.generator.translator.TranslatorManager;
 import com.speedment.runtime.config.*;
 import com.speedment.runtime.config.trait.HasName;
-import com.speedment.runtime.core.ApplicationBuilder;
 import com.speedment.runtime.core.Speedment;
 import com.speedment.runtime.core.component.ProjectComponent;
 import com.speedment.runtime.core.internal.AbstractApplicationMetadata;
@@ -84,7 +83,6 @@ public void simpleModelTestSetUp() {
             .withComponent(SilentTranslatorManager.class)
             .withSkipCheckDatabaseConnectivity()
             .withSkipValidateRuntimeConfig()
-            .withLogging(ApplicationBuilder.LogType.APPLICATION_BUILDER)
             .build();
         
         project = speedment.getOrThrow(ProjectComponent.class).getProject();
diff --git a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/Document.java b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/Document.java
index 1d1bc62c84..6b511af5ed 100644
--- a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/Document.java
+++ b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/Document.java
@@ -211,7 +211,7 @@ default MapStream<String, Map<String, Object>> childrenByKey() {
         return stream()
             .filterValue(List.class::isInstance)
             .mapValue(List.class::cast)
-            .flatMapValue(List::stream)
+            .flatMapValue(List<?>::stream)
             .filterValue(Map.class::isInstance)
             .mapValue(v -> (Map<String, Object>)v);
     }
diff --git a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/AbstractTraitView.java b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/AbstractTraitView.java
new file mode 100644
index 0000000000..6ccc064377
--- /dev/null
+++ b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/AbstractTraitView.java
@@ -0,0 +1,28 @@
+package com.speedment.runtime.config.trait;
+
+import com.speedment.runtime.config.Document;
+import com.speedment.runtime.config.internal.BaseDocument;
+import java.util.Map;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * An abstract base implementation for a view of a particular trait.
+ * 
+ * @author  Emil Forslund
+ * @since   3.0.1
+ */
+abstract class AbstractTraitView
+extends BaseDocument implements HasMainInterface {
+        
+    private final Class<? extends Document> mainInterface;
+
+    protected AbstractTraitView(Document parent, Map<String, Object> data, Class<? extends Document> mainInterface) {
+        super(parent, data);
+        this.mainInterface = requireNonNull(mainInterface);
+    }
+
+    @Override
+    public final Class<? extends Document> mainInterface() {
+        return mainInterface;
+    }
+}
\ No newline at end of file
diff --git a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasAlias.java b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasAlias.java
index 70d3922f29..c67acbb972 100644
--- a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasAlias.java
+++ b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasAlias.java
@@ -17,7 +17,6 @@
 package com.speedment.runtime.config.trait;
 
 import com.speedment.runtime.config.Document;
-import com.speedment.runtime.config.util.TraitUtil.AbstractTraitView;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasColumn.java b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasColumn.java
index c14b077973..78c86278c4 100644
--- a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasColumn.java
+++ b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasColumn.java
@@ -19,7 +19,6 @@
 import com.speedment.runtime.config.Column;
 import com.speedment.runtime.config.Document;
 import com.speedment.runtime.config.Table;
-import com.speedment.runtime.config.util.TraitUtil.AbstractTraitView;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasEnabled.java b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasEnabled.java
index b8f43a3994..b893f81cb5 100644
--- a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasEnabled.java
+++ b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasEnabled.java
@@ -17,7 +17,6 @@
 package com.speedment.runtime.config.trait;
 
 import com.speedment.runtime.config.Document;
-import com.speedment.runtime.config.util.TraitUtil.AbstractTraitView;
 
 import java.util.Map;
 
diff --git a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasName.java b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasName.java
index 99ebbc6cbc..513f91f877 100644
--- a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasName.java
+++ b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasName.java
@@ -20,7 +20,6 @@
 import com.speedment.runtime.config.Document;
 import com.speedment.runtime.config.Project;
 import com.speedment.runtime.config.exception.SpeedmentConfigException;
-import com.speedment.runtime.config.util.TraitUtil.AbstractTraitView;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasNullable.java b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasNullable.java
index bf63e031a8..578350b302 100644
--- a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasNullable.java
+++ b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasNullable.java
@@ -17,7 +17,6 @@
 package com.speedment.runtime.config.trait;
 
 import com.speedment.runtime.config.Document;
-import com.speedment.runtime.config.util.TraitUtil.AbstractTraitView;
 
 import java.util.Map;
 
diff --git a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasOrderType.java b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasOrderType.java
index 47c10e78dd..49bbffa627 100644
--- a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasOrderType.java
+++ b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasOrderType.java
@@ -18,7 +18,6 @@
 
 import com.speedment.runtime.config.Document;
 import com.speedment.runtime.config.parameter.OrderType;
-import com.speedment.runtime.config.util.TraitUtil.AbstractTraitView;
 
 import java.util.Map;
 
diff --git a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasOrdinalPosition.java b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasOrdinalPosition.java
index bd1a66155f..48caf7e448 100644
--- a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasOrdinalPosition.java
+++ b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasOrdinalPosition.java
@@ -17,7 +17,6 @@
 package com.speedment.runtime.config.trait;
 
 import com.speedment.runtime.config.Document;
-import com.speedment.runtime.config.util.TraitUtil.AbstractTraitView;
 
 import java.util.Comparator;
 import java.util.Map;
diff --git a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasPackageName.java b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasPackageName.java
index 6a3eec7c75..ae129103b8 100644
--- a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasPackageName.java
+++ b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/trait/HasPackageName.java
@@ -17,7 +17,6 @@
 package com.speedment.runtime.config.trait;
 
 import com.speedment.runtime.config.Document;
-import com.speedment.runtime.config.util.TraitUtil.AbstractTraitView;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/util/TraitUtil.java b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/util/TraitUtil.java
index 9529df2067..691bedbdea 100644
--- a/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/util/TraitUtil.java
+++ b/runtime-parent/runtime-config/src/main/java/com/speedment/runtime/config/util/TraitUtil.java
@@ -17,12 +17,10 @@
 package com.speedment.runtime.config.util;
 
 import com.speedment.runtime.config.Document;
-import com.speedment.runtime.config.internal.BaseDocument;
 import com.speedment.runtime.config.trait.HasMainInterface;
 
 import java.util.Map;
 
-import static java.util.Objects.requireNonNull;
 
 /**
  *
@@ -60,21 +58,6 @@ public interface TraitViewConstructor<TRAIT> {
         TRAIT create(Document parent, Map<String, Object> data, Class<? extends Document> mainInterface);
     }
     
-    public static abstract class AbstractTraitView extends BaseDocument implements HasMainInterface {
-        
-        private final Class<? extends Document> mainInterface;
-
-        protected AbstractTraitView(Document parent, Map<String, Object> data, Class<? extends Document> mainInterface) {
-            super(parent, data);
-            this.mainInterface = requireNonNull(mainInterface);
-        }
-
-        @Override
-        public final Class<? extends Document> mainInterface() {
-            return mainInterface;
-        }
-    }
-    
     /**
      * Utility classes should not be instantiated.
      */
diff --git a/runtime-parent/runtime-core/src/main/java/com/speedment/runtime/core/internal/db/AbstractDbmsOperationHandler.java b/runtime-parent/runtime-core/src/main/java/com/speedment/runtime/core/internal/db/AbstractDbmsOperationHandler.java
index 730950f0b2..4003cafd41 100644
--- a/runtime-parent/runtime-core/src/main/java/com/speedment/runtime/core/internal/db/AbstractDbmsOperationHandler.java
+++ b/runtime-parent/runtime-core/src/main/java/com/speedment/runtime/core/internal/db/AbstractDbmsOperationHandler.java
@@ -238,14 +238,14 @@ protected <ENTITY> void handleSqlStatement(Dbms dbms, Connection conn, SqlInsert
     }
 
     protected void handleSqlStatement(Dbms dbms, Connection conn, SqlUpdateStatement sqlStatement) throws SQLException {
-        handleSqlStatementHelper(dbms, conn, sqlStatement);
+        handleSqlStatementHelper(conn, sqlStatement);
     }
 
     protected void handleSqlStatement(Dbms dbms, Connection conn, SqlDeleteStatement sqlStatement) throws SQLException {
-        handleSqlStatementHelper(dbms, conn, sqlStatement);
+        handleSqlStatementHelper(conn, sqlStatement);
     }
 
-    private void handleSqlStatementHelper(Dbms dbms, Connection conn, SqlStatement sqlStatement) throws SQLException {
+    private void handleSqlStatementHelper(Connection conn, SqlStatement sqlStatement) throws SQLException {
         try (final PreparedStatement ps = conn.prepareStatement(sqlStatement.getSql(), Statement.NO_GENERATED_KEYS)) {
             int i = 1;
             for (Object o : sqlStatement.getValues()) {
@@ -259,7 +259,7 @@ protected void postSuccessfulTransaction(List<? extends SqlStatement> sqlStateme
         sqlStatementList.stream()
             .filter(SqlInsertStatement.class::isInstance)
             .map(SqlInsertStatement.class::cast)
-            .forEach(SqlInsertStatement::acceptGeneratedKeys);
+            .forEach(SqlInsertStatement<?>::acceptGeneratedKeys);
     }
 
     @FunctionalInterface