diff --git a/jOOQ-console/src/main/java/org/jooq/debug/console/remote/messaging/CommandMessage.java b/jOOQ-console/src/main/java/org/jooq/debug/console/remote/messaging/CommandMessage.java
index dc968df395..a2eab95957 100644
--- a/jOOQ-console/src/main/java/org/jooq/debug/console/remote/messaging/CommandMessage.java
+++ b/jOOQ-console/src/main/java/org/jooq/debug/console/remote/messaging/CommandMessage.java
@@ -52,31 +52,31 @@ public abstract class CommandMessage extends Message {
 
     /**
      * Set the arguments that will be used when the message is run.
-     * @param args the arguments, which must be serializable.
+     * @param arguments the arguments, which must be serializable.
      */
-    void setArgs(Object... args) {
-        if(args.length == 0) {
-            args = null;
+    void setArgs(Object... arguments) {
+        if(arguments.length == 0) {
+            arguments = null;
         }
-        this.args = args;
+        this.args = arguments;
     }
 
     /**
      * Execute that message asynchronously with the given arguments.
-     * @param args the arguments, which must be serializable.
+     * @param arguments the arguments, which must be serializable.
      */
-    public void asyncExec(CommunicationInterface communicationInterface, Object... args) {
-        setArgs(args);
+    public void asyncExec(CommunicationInterface communicationInterface, Object... arguments) {
+        setArgs(arguments);
         asyncSend(communicationInterface);
     }
 
     /**
      * Execute that message synchronously with the given arguments and return the result.
-     * @param args the arguments, which must be serializable.
+     * @param arguments the arguments, which must be serializable.
      * @return the result of the execution.
      */
-    public Object syncExec(CommunicationInterface communicationInterface, Object... args) {
-        setArgs(args);
+    public Object syncExec(CommunicationInterface communicationInterface, Object... arguments) {
+        setArgs(arguments);
         return syncSend(communicationInterface);
     }
 
@@ -88,11 +88,11 @@ public abstract class CommandMessage extends Message {
 
     /**
      * Run the message.
-     * @param args the arguments that were specified for that command, or an empty array if none were specified.
+     * @param arguments the arguments that were specified for that command, or an empty array if none were specified.
      * @return the result that may be passed back to the caller.
      * @throws Exception any exception that may happen, and which would be passed back if it is a synchronous execution.
      */
-    public abstract Object run(Object[] args) throws Exception;
+    public abstract Object run(Object[] arguments) throws Exception;
 
     @Override
     public String toString() {
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
index d45bd6e766..dbd4967c24 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
@@ -75,8 +75,6 @@ import java.sql.Connection;
 import java.util.Arrays;
 
 import org.jooq.Configuration;
-import org.jooq.ConfigurationProvider;
-import org.jooq.ConfigurationRegistry;
 import org.jooq.Cursor;
 import org.jooq.ExecuteContext;
 import org.jooq.Field;
@@ -354,7 +352,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
 
     @SuppressWarnings("deprecation")
     protected final void register(final Configuration configuration) {
-        ConfigurationRegistry.setProvider(new ConfigurationProvider() {
+        org.jooq.ConfigurationRegistry.setProvider(new org.jooq.ConfigurationProvider() {
 
             @Override
             public Configuration provideFor(Configuration c) {
@@ -788,6 +786,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
         testBatchAuthors("Gamma", "Helm", "Johnson");
     }
 
+    @SuppressWarnings("unchecked")
     @Test
     public void testBatchMultiple() throws Exception {
         jOOQAbstractTest.reset = false;
@@ -819,6 +818,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
         testBatchAuthors("Gamma", "Helm", "Johnson");
     }
 
+    @SuppressWarnings("unchecked")
     @Test
     public void testBatchStore() throws Exception {
         jOOQAbstractTest.reset = false;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQCUBRIDTest.java b/jOOQ-test/src/org/jooq/test/jOOQCUBRIDTest.java
index 32d570ee2c..f7b2422120 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQCUBRIDTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQCUBRIDTest.java
@@ -337,16 +337,19 @@ public class jOOQCUBRIDTest extends jOOQAbstractTest<
         return TBooleans.YES_NO_UC;
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
         return (TableField) TBooleans.VC_BOOLEAN;
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
         return (TableField) TBooleans.C_BOOLEAN;
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
         return (TableField) TBooleans.N_BOOLEAN;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java b/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java
index b9dc25a498..5807da93e5 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java
@@ -415,16 +415,19 @@ public class jOOQDB2Test extends jOOQAbstractTest<
         return TBooleans.YES_NO_UC;
     }
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
     protected TableField<TBooleansRecord, Boolean> TBooleans_VC() {
         return (TableField) TBooleans.VC_BOOLEAN;
     }
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
     protected TableField<TBooleansRecord, Boolean> TBooleans_C() {
         return (TableField) TBooleans.C_BOOLEAN;
     }
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
     protected TableField<TBooleansRecord, Boolean> TBooleans_N() {
         return (TableField) TBooleans.N_BOOLEAN;