diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPartMap.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPartMap.java
index 21733c5d68..b96520a83a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPartMap.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPartMap.java
@@ -98,7 +98,7 @@ implements
     }
 
     @Override
-    public final V put(K key, V value) {
+    public /* non-final */ V put(K key, V value) {
         return map.put(key, value);
     }
 
@@ -109,7 +109,7 @@ implements
 
     @Override
     public final void putAll(Map<? extends K, ? extends V> m) {
-        map.putAll(m);
+        m.forEach(this::put);
     }
 
     @Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
index ba679b80f1..a7bd9bca31 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
@@ -221,6 +221,9 @@ final class DeleteQueryImpl<R extends Record> extends AbstractDMLQuery<R> implem
 
     @Override
     public final void addLimit(Field<? extends Number> numberOfRows) {
+        if (numberOfRows instanceof NoField)
+            return;
+
         limit = numberOfRows;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
index ea73e38155..fe375868fd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
@@ -362,6 +362,14 @@ final class FieldMapForUpdate extends AbstractQueryPartMap<FieldOrRow, FieldOrRo
         });
     }
 
+    @Override
+    public FieldOrRowOrSelect put(FieldOrRow key, FieldOrRowOrSelect value) {
+        if (key instanceof NoField || value instanceof NoField)
+            return null;
+        else
+            return super.put(key, value);
+    }
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
index 63c275e952..f92d44be47 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
@@ -522,6 +522,9 @@ implements
 
     @Override
     public final void addLimit(Field<? extends Number> l) {
+        if (l instanceof NoField)
+            return;
+
         limit = l;
     }