diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MutableAttributeMappingList.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MutableAttributeMappingList.java
index 3d7838897458..eacdc09c968e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MutableAttributeMappingList.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MutableAttributeMappingList.java
@@ -22,7 +22,7 @@
 @Deprecated
 public final class MutableAttributeMappingList implements AttributeMappingsList {
 
-	private final List list;
+	private final List<AttributeMapping> list;
 
 	public MutableAttributeMappingList(final int length) {
 		this.list = new ArrayList<>( length );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java
index 7df6d900352d..db13d7b2e468 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java
@@ -25,7 +25,7 @@ public final class EntityPersisterConcurrentMap {
 	private volatile String[] keys = new String[0];
 
 	public EntityPersister get(final String name) {
-		final EntityPersisterHolder entityPersisterHolder = map.get( name );
+		final var entityPersisterHolder = map.get( name );
 		if ( entityPersisterHolder != null ) {
 			return entityPersisterHolder.entityPersister;
 		}
@@ -60,13 +60,13 @@ private void recomputeValues() {
 		final EntityPersister[] newValues = new EntityPersister[size];
 		final String[] newKeys = new String[size];
 		int i = 0;
-		for ( Map.Entry<String, EntityPersisterHolder> e : map.entrySet() ) {
-			newValues[i] = e.getValue().entityPersister;
-			newKeys[i] = e.getKey();
+		for ( var entry : map.entrySet() ) {
+			newValues[i] = entry.getValue().entityPersister;
+			newKeys[i] = entry.getKey();
 			i++;
 		}
-		this.values = newValues;
-		this.keys = newKeys;
+		values = newValues;
+		keys = newKeys;
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeModelCreationContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeModelCreationContext.java
index b60471506b58..d7c70671e241 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeModelCreationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeModelCreationContext.java
@@ -34,10 +34,7 @@ public interface RuntimeModelCreationContext {
 
 	MappingMetamodelImplementor getDomainModel();
 
-	default TypeConfiguration getTypeConfiguration() {
-		return getBootstrapContext() == null ? getSessionFactory().getTypeConfiguration()
-				: getBootstrapContext().getTypeConfiguration();
-	}
+	TypeConfiguration getTypeConfiguration();
 
 	default JavaTypeRegistry getJavaTypeRegistry() {
 		return getTypeConfiguration().getJavaTypeRegistry();
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java
index 4abfd1b28d29..77eb3f485218 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java
@@ -25,7 +25,7 @@ public interface BasicJavaType<T> extends JavaType<T> {
 	 */
 	default JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
 		// match legacy behavior
-		int jdbcTypeCode = JdbcTypeJavaClassMappings.INSTANCE.determineJdbcTypeCodeForJavaClass( getJavaTypeClass() );
+		final int jdbcTypeCode = JdbcTypeJavaClassMappings.INSTANCE.determineJdbcTypeCodeForJavaClass( getJavaTypeClass() );
 		final var descriptor = indicators.getJdbcType( indicators.resolveJdbcTypeCode( jdbcTypeCode ) );
 		return descriptor instanceof AdjustableJdbcType adjustableJdbcType
 				? adjustableJdbcType.resolveIndicatedType( indicators, this )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/LocalTemporaryTableMutationStrategyNoDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/LocalTemporaryTableMutationStrategyNoDropTest.java
index 96005742ce1d..7f145446727a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/LocalTemporaryTableMutationStrategyNoDropTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/LocalTemporaryTableMutationStrategyNoDropTest.java
@@ -36,6 +36,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.spi.TypeConfiguration;
 import org.junit.jupiter.api.Test;
 
 import java.util.Map;
@@ -136,6 +137,11 @@ public BootstrapContext getBootstrapContext() {
 			return null;
 		}
 
+		@Override
+		public TypeConfiguration getTypeConfiguration() {
+			return sessionFactory.getTypeConfiguration();
+		}
+
 		@Override
 		public MetadataImplementor getBootModel() {
 			return scope.getMetadataImplementor();