diff --git a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
index e28920b09f..396a6c3a67 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
@@ -223,13 +223,14 @@ final class BlockImpl extends AbstractRowCountQuery implements Block {
                 break;
             }
 
+
+
+
+
+
+
+            case HSQLDB:
             case MARIADB:
-
-
-
-
-
-
             default: {
                 increment(ctx.data(), DATA_BLOCK_NESTING);
                 accept0(ctx);
@@ -473,7 +474,7 @@ final class BlockImpl extends AbstractRowCountQuery implements Block {
 
         if (ctx.family() == MARIADB && toplevel(ctx.data(), DATA_BLOCK_NESTING))
             ctx.sql(' ').visit(K_NOT).sql(' ').visit(K_ATOMIC);
-        else if (ctx.family() == HSQLDB && toplevel(ctx.data(), DATA_BLOCK_NESTING))
+        else if (ctx.family() == HSQLDB)
             ctx.sql(' ').visit(K_ATOMIC);
 
         ctx.formatIndentStart();
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
index f84207910d..71cc2d7f86 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
@@ -523,6 +523,9 @@ package org.jooq.impl;
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Keywords.java b/jOOQ/src/main/java/org/jooq/impl/Keywords.java
index c887dfb6e7..b7b4356ce9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Keywords.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Keywords.java
@@ -246,6 +246,7 @@ final class Keywords {
     static final Keyword K_MATERIALIZED                     = keyword("materialized");
     static final Keyword K_MAXVALUE                         = keyword("maxvalue");
     static final Keyword K_MERGE_INTO                       = keyword("merge into");
+    static final Keyword K_MESSAGE                          = keyword("message");
     static final Keyword K_MESSAGE_TEXT                     = keyword("message_text");
     static final Keyword K_MILLISECOND                      = keyword("millisecond");
     static final Keyword K_MINUS                            = keyword("minus");
diff --git a/jOOQ/src/main/java/org/jooq/impl/Signal.java b/jOOQ/src/main/java/org/jooq/impl/Signal.java
index 851a59738d..f8b34fa1f5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Signal.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Signal.java
@@ -120,6 +120,25 @@ package org.jooq.impl;
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java
index e6019251d2..2bf4fde63f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tools.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java
@@ -5297,7 +5297,7 @@ final class Tools {
         if (updateCounts == null)
             throw new IllegalStateException();
         else
-            return updateCounts == 1;
+            return updateCounts.intValue() == 1;
     }
 
     /**