diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java
index feb434aedf..b866ccd307 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java
@@ -137,7 +137,7 @@ public abstract class EntityType<T extends EntityType<T>> extends ResourceType<T
 
    @XmlElement(name = "Description")
    private String description;
-   @XmlElement(name = "TasksInProgress")
+   @XmlElement(namespace = VCLOUD_1_5_NS, name = "Tasks")
    private TasksInProgress tasksInProgress;
    @XmlAttribute
    private String id;
@@ -206,9 +206,7 @@ public abstract class EntityType<T extends EntityType<T>> extends ResourceType<T
       if (o == null || getClass() != o.getClass())
          return false;
       EntityType<?> that = EntityType.class.cast(o);
-      return super.equals(that) &&
-            equal(this.description, that.description) &&
-            equal(this.name, that.name);
+      return super.clone(that);
    }
 
    @Override
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
index c218c59efd..010a18ba3f 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
@@ -253,7 +253,7 @@ public class Media extends ResourceEntityType<Media> {
          return false;
       Media that = Media.class.cast(o);
       return super.clone(that) && 
-            equal(this.owner, that.owner) && equal(this.imageType, that.imageType) && equal(this.size, that.size);
+            equal(this.imageType, that.imageType) && equal(this.size, that.size);
    }
 
    @Override