diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntities.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntities.java
index d4fc25c893..1ad03ccf2a 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntities.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntities.java
@@ -73,7 +73,7 @@ public class ResourceEntities {
        * @see ResourceEntities#getResourceEntities()
        */
       public Builder resourceEntities(Set<Reference> resourceEntities) {
-         this.resourceEntities = Sets.newLinkedHashSet(checkNotNull(resourceEntities, "resourceEntities"));
+         this.resourceEntities = ImmutableSet.copyOf(checkNotNull(resourceEntities, "resourceEntities"));
          return this;
       }
 
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SourcedCompositionItemParam.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SourcedCompositionItemParam.java
index b92176f2f7..c8755a4668 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SourcedCompositionItemParam.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SourcedCompositionItemParam.java
@@ -109,7 +109,7 @@ public class SourcedCompositionItemParam {
        * @see SourcedCompositionItemParam#getNetworkAssignments()
        */
       public Builder networkAssignments(Set<NetworkAssignment> networkAssignments) {
-         this.networkAssignments = checkNotNull(networkAssignments, "networkAssignments");
+         this.networkAssignments = ImmutableSet.copyOf(checkNotNull(networkAssignments, "networkAssignments"));
          return this;
       }
 
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java
index 0908cd99e9..f3e8ce4318 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java
@@ -72,7 +72,7 @@ public class StaticRoute {
       private String name;
       private String network;
       private String nextHopIp;
-      private String _interface;
+      private String theInterface;
 
       /**
        * @see StaticRoute#getName()
@@ -101,20 +101,20 @@ public class StaticRoute {
       /**
        * @see StaticRoute#getInterface()
        */
-      public Builder _interface(String _interface) {
-         this._interface = _interface;
+      public Builder setInterface(String theInterface) {
+         this.theInterface = theInterface;
          return this;
       }
 
       public StaticRoute build() {
-         return new StaticRoute(name, network, nextHopIp, _interface);
+         return new StaticRoute(name, network, nextHopIp, theInterface);
       }
 
       public Builder fromStaticRoute(StaticRoute in) {
          return name(in.getName())
                .network(in.getNetwork())
                .nextHopIp(in.getNextHopIp())
-               ._interface(in.getInterface());
+               .setInterface(in.getInterface());
       }
    }
 
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoutingService.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoutingService.java
index a0514d4009..995b65a3d2 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoutingService.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoutingService.java
@@ -71,13 +71,13 @@ public class StaticRoutingService extends NetworkServiceType<StaticRoutingServic
 
    public static class Builder extends NetworkServiceType.Builder<StaticRoutingService> {
 
-      private List<StaticRoute> staticRoutes;
+      private List<StaticRoute> staticRoutes = ImmutableList.of();
 
       /**
        * @see StaticRoutingService#getStaticRoutes()
        */
       public Builder staticRoutes(List<StaticRoute> staticRoutes) {
-         this.staticRoutes = checkNotNull(staticRoutes, "staticRoutes");
+         this.staticRoutes = ImmutableList.copyOf(checkNotNull(staticRoutes, "staticRoutes"));
          return this;
       }
 
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksInProgress.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksInProgress.java
index b0a002f81f..cefefc0ec9 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksInProgress.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksInProgress.java
@@ -53,7 +53,7 @@ public class TasksInProgress {
        * @see TasksInProgress#getTasks()
        */
       public Builder tasks(Set<Task> tasks) {
-         this.tasks = checkNotNull(tasks, "tasks");
+         this.tasks = ImmutableSet.copyOf(checkNotNull(tasks, "tasks"));
          return this;
       }