diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultEmbeddableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultEmbeddableDefinition.java
index 9049b86ca2..2595d0cd71 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultEmbeddableDefinition.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultEmbeddableDefinition.java
@@ -80,13 +80,16 @@ public class DefaultEmbeddableDefinition
         this.referencingComment = referencingComment;
         this.referencingTable = referencingTable;
         this.embeddableColumns = new ArrayList<>();
-        this.replacesFields = replacesFields;
 
 
 
 
-        if (replacesFields)
+        if (replacesFields) {
             log.info("Commercial feature", "Embeddables replacing fields is a commercial only feature. Please upgrade to the jOOQ Professional Edition");
+            replacesFields = false;
+        }
+
+        this.replacesFields = replacesFields;
 
         for (int i = 0; i < referencingColumns.size(); i++)
             embeddableColumns.add(new DefaultEmbeddableColumnDefinition(this, definingColumnNames.get(i), referencingColumns.get(i), i + 1));
diff --git a/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java b/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java
index b3ca311359..da768d8d57 100644
--- a/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java
+++ b/jOOQ/src/main/java/org/jooq/LikeEscapeStep.java
@@ -37,9 +37,6 @@
  */
 package org.jooq;
 
-import org.jetbrains.annotations.*;
-
-
 // ...
 // ...
 // ...
@@ -58,12 +55,15 @@ import static org.jooq.SQLDialect.MYSQL;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
+// ...
 import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...
 // ...
 // ...
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * A step in the creation of a <code>LIKE</code> predicate to which an
  * <code>ESCAPE</code> clause can be appended.
diff --git a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
index 50e7516b3e..7bdd0fc710 100644
--- a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
@@ -37,9 +37,6 @@
  */
 package org.jooq;
 
-import org.jetbrains.annotations.*;
-
-
 // ...
 // ...
 // ...
@@ -62,6 +59,7 @@ import static org.jooq.SQLDialect.MYSQL;
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...
@@ -70,6 +68,8 @@ import static org.jooq.SQLDialect.SQLITE;
 
 import org.jooq.impl.DSL;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
  * {@link Record} types.