diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/Alias.java b/querydsl-core/src/main/java/com/mysema/query/alias/Alias.java
index c88438a78..ededbc8ce 100644
--- a/querydsl-core/src/main/java/com/mysema/query/alias/Alias.java
+++ b/querydsl-core/src/main/java/com/mysema/query/alias/Alias.java
@@ -141,7 +141,7 @@ public final class Alias {
         if (rv != null) {
             return rv;
         }else if (arg instanceof EntityPath<?>){    
-            return (EntityPathBase)arg;
+            return (EntityPathBase<D>)arg;
         } else if (arg instanceof ManagedObject) {
             return (EntityPathBase<D>) ((ManagedObject) arg).__mappedPath();
         } else {
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/Supertype.java b/querydsl-core/src/main/java/com/mysema/query/codegen/Supertype.java
index ad3a852e7..f8c3a01bb 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/Supertype.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/Supertype.java
@@ -5,6 +5,8 @@
  */
 package com.mysema.query.codegen;
 
+import javax.annotation.Nullable;
+
 import com.mysema.codegen.model.Type;
 
 /**
@@ -13,6 +15,7 @@ import com.mysema.codegen.model.Type;
  */
 public class Supertype {
 
+    @Nullable
     private EntityType entityType;
 
     private final Type type;
@@ -26,6 +29,7 @@ public class Supertype {
         this.entityType = entityType;
     }
 
+    @Nullable
     public EntityType getEntityType() {
         return entityType;
     }