diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java
index 74c430aefdff..0aea2a6c0d5e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java
@@ -13,7 +13,6 @@
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.TemporalUnit;
 import org.hibernate.query.sqm.function.FunctionRenderer;
-import org.hibernate.query.sqm.function.FunctionRenderingSupport;
 import org.hibernate.query.sqm.function.SelfRenderingSqmFunction;
 import org.hibernate.query.sqm.produce.function.ArgumentsValidator;
 import org.hibernate.query.sqm.tree.SqmTypedNode;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java
index 74b122126680..d51c09b4e65b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java
@@ -12,7 +12,6 @@
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor;
 import org.hibernate.query.sqm.function.FunctionRenderer;
-import org.hibernate.query.sqm.function.FunctionRenderingSupport;
 import org.hibernate.query.sqm.function.SelfRenderingSqmFunction;
 import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator;
 import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java
index e83fcd1a337e..596e5d29a676 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java
@@ -27,7 +27,7 @@
 
 /**
  * Resolve according to JPA spec 4.8.5
- *
+ * <p>
  * {@code SUM} returns:
  * <ul>
  * <li>{@code Long} when applied to state fields of integral types (other than {@code BigInteger});
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java
index 343c71800cd6..5dffaffc9caf 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java
@@ -11,7 +11,6 @@
 import org.hibernate.query.ReturnableType;
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.function.FunctionRenderer;
-import org.hibernate.query.sqm.function.FunctionRenderingSupport;
 import org.hibernate.query.sqm.function.SelfRenderingSqmFunction;
 import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
 import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java
index 3ee36151eee7..ddc95241975d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java
@@ -46,7 +46,7 @@
  */
 public class TrimFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
 	private final Dialect dialect;
-	private SqlAstNodeRenderingMode argumentRenderingMode;
+	private final SqlAstNodeRenderingMode argumentRenderingMode;
 
 	public TrimFunction(Dialect dialect, TypeConfiguration typeConfiguration) {
 		this( dialect, typeConfiguration, SqlAstNodeRenderingMode.DEFAULT );