diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/IdentifierSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/IdentifierSource.java
index fa982fafb2..d0adf76824 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/IdentifierSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/IdentifierSource.java
@@ -25,7 +25,6 @@ package org.hibernate.metamodel.spi.source;
 
 import org.hibernate.id.EntityIdentifierNature;
 import org.hibernate.metamodel.spi.binding.IdentifierGeneratorDefinition;
-import org.hibernate.metamodel.spi.domain.JavaType;
 
 /**
  * Contract describing source of identifier information for the entity.
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
index cfdc8c4512..b14772a964 100644
--- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
@@ -65,7 +65,7 @@ public class CallbackProcessorImpl implements CallbackProcessor {
 		if ( entityBinding.getHierarchyDetails().getEntityMode() != EntityMode.POJO ) {
 			return;
 		}
-		final Class entityClass = entityBinding.getEntity().getClassReference();
+		final Class entityClass = entityBinding.getEntity().getClassReference().getResolvedClass();
 		for ( final Class annotationClass : CALLBACK_ANNOTATION_CLASSES ) {
 			callbackRegistry.addEntityCallbacks(
 					entityClass,