diff --git a/cloudbridge/.classpath b/cloudbridge/.classpath
index 29668e3dccb..2c2c05cab84 100644
--- a/cloudbridge/.classpath
+++ b/cloudbridge/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry exported="true" kind="lib" path="/deps/cloudbridge-lib"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
 </classpath>
diff --git a/cloudbridge/src/com/cloud/stack/models/CloudStackNic.java b/cloudbridge/src/com/cloud/stack/models/CloudStackNic.java
index a83d22cbe02..f6156eec2d9 100644
--- a/cloudbridge/src/com/cloud/stack/models/CloudStackNic.java
+++ b/cloudbridge/src/com/cloud/stack/models/CloudStackNic.java
@@ -20,7 +20,7 @@ import com.google.gson.annotations.SerializedName;
 public class CloudStackNic {
 	
     @SerializedName(ApiConstants.ID)
-    private Long id;
+    private String id;
 
     @SerializedName(ApiConstants.BROADCAST_URI)
     private String broadcastUri;
@@ -44,7 +44,7 @@ public class CloudStackNic {
     private String netmask;
     
     @SerializedName(ApiConstants.NETWORK_ID)
-    private Long networkid;
+    private String networkid;
     
     @SerializedName(ApiConstants.TRAFFIC_TYPE)
     private String trafficType;
@@ -55,11 +55,11 @@ public class CloudStackNic {
     public CloudStackNic() {
     }
 
-	public Long getId() {
-		return id;
-	}
+    public String getId() {
+        return id;
+    }
 
-	public Long getNetworkid() {
+	public String getNetworkid() {
 		return networkid;
 	}
 
diff --git a/cloudbridge/src/com/cloud/stack/models/CloudStackResourceLimit.java b/cloudbridge/src/com/cloud/stack/models/CloudStackResourceLimit.java
index 3137a04ebcf..1f9bd677d6c 100644
--- a/cloudbridge/src/com/cloud/stack/models/CloudStackResourceLimit.java
+++ b/cloudbridge/src/com/cloud/stack/models/CloudStackResourceLimit.java
@@ -21,7 +21,7 @@ public class CloudStackResourceLimit {
     @SerializedName(ApiConstants.ACCOUNT)
     private String accountName;
     @SerializedName(ApiConstants.DOMAIN_ID)
-    private Long domainId;
+    private String domainId;
     @SerializedName(ApiConstants.DOMAIN)
     private String domainName;
     @SerializedName(ApiConstants.RESOURCE_TYPE)
@@ -37,9 +37,9 @@ public class CloudStackResourceLimit {
 		return accountName;
 	}
 
-	public Long getDomainId() {
-		return domainId;
-	}
+    public String getDomainId() {
+        return domainId;
+    }
 
 	public String getDomainName() {
 		return domainName;