diff --git a/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java b/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java
index 9946d07462..467c18cd08 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java
@@ -113,7 +113,7 @@ public abstract class DAOImpl<R extends UpdatableRecord<R>, P, T> implements DAO
         this.mapper = ((FieldsImpl<R>) table.recordType()).mapper(this.configuration = Tools.configuration(configuration), type);
     }
 
-    public final DSLContext ctx() {
+    public /* non-final */ DSLContext ctx() {
         return configuration().dsl();
     }
 
@@ -331,7 +331,7 @@ public abstract class DAOImpl<R extends UpdatableRecord<R>, P, T> implements DAO
     }
 
     @Override
-    public final Optional<P> findOptionalById(T id) {
+    public /* non-final */ Optional<P> findOptionalById(T id) {
         return Optional.ofNullable(findById(id));
     }