diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
index afc8d00296..6249821d63 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
@@ -602,12 +602,12 @@ class MetaImpl implements Meta, Serializable {
         @SuppressWarnings("unchecked")
         private final UniqueKey<Record> createPrimaryKey(Result<Record> result, int columnName) {
             if (result.size() > 0) {
-                TableField<Record, ?>[] fields = new TableField[result.size()];
-                for (int i = 0; i < fields.length; i++) {
-                    fields[i] = (TableField<Record, ?>) field(result.get(i).getValue(columnName, String.class));
+                TableField<Record, ?>[] f = new TableField[result.size()];
+                for (int i = 0; i < f.length; i++) {
+                    f[i] = (TableField<Record, ?>) field(result.get(i).getValue(columnName, String.class));
                 }
 
-                return new MetaUniqueKey(this, fields);
+                return new MetaUniqueKey(this, f);
             }
             else {
                 return null;
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockConfiguration.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockConfiguration.java
index c24e84d1e7..274349395f 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockConfiguration.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockConfiguration.java
@@ -65,6 +65,7 @@ import org.jooq.conf.Settings;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings("deprecation")
 public class MockConfiguration implements Configuration {
 
     /**
@@ -130,7 +131,6 @@ public class MockConfiguration implements Configuration {
         return delegate.converterProvider();
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public org.jooq.SchemaMapping schemaMapping() {
         return delegate.schemaMapping();