diff --git a/xilinx/java/bbaexport.java b/xilinx/java/bbaexport.java
index 0937cb1ef..8cc6f0d33 100644
--- a/xilinx/java/bbaexport.java
+++ b/xilinx/java/bbaexport.java
@@ -799,7 +799,7 @@ public static void main(String[] args) throws IOException {
             ++known_id_count;
         }
 
-        TimingModel tmg = new TimingModel(des);
+        TimingModel tmg = new TimingModel(d);
         tmg.build();
 
         // Unique tiletypes
@@ -993,7 +993,7 @@ public static void main(String[] args) throws IOException {
         }
 
         // Nodes
-        HashSet<TileTypeEnum> intTileTypes = Utils.getIntTileTypes();
+        Set<TileTypeEnum> intTileTypes = Utils.getIntTileTypes();
         HashSet<Long> seenNodes = new HashSet<>();
         int curr = 0, total = d.getAllTiles().size();
         ArrayList<Integer> nodeWireCount = new ArrayList<>(), nodeIntent = new ArrayList<>();
@@ -1153,7 +1153,7 @@ public static void main(String[] args) throws IOException {
         bba.printf("ref pip_timing_classes\n");
         // Chip info
         bba.println("label chip_info");
-        bba.printf("str |%s|\n", d.getDeviceName()); //device name
+        bba.printf("str |%s|\n", d.getName()); //device name
         bba.printf("str |RapidWright|\n"); //generator
         bba.printf("u32 %d\n", 1); //version
         bba.printf("u32 %d\n", d.getColumns()); //width
diff --git a/xilinx/java/json2dcp.java b/xilinx/java/json2dcp.java
index bcc15d8c8..4921f2c2d 100644
--- a/xilinx/java/json2dcp.java
+++ b/xilinx/java/json2dcp.java
@@ -390,23 +390,21 @@ else if (unitype == Unisim.FDCE_1)
         }
 
         EDIFCell top = des.getNetlist().getTopCell();
-        EDIFNet edif_gnd = EDIFTools.getStaticNet(NetType.GND, top, des.getNetlist());
-        EDIFNet edif_vcc = EDIFTools.getStaticNet(NetType.VCC, top, des.getNetlist());
 
         for (NextpnrNet nn : ndes.nets.values()) {
             //System.out.println("create net " + nn.name);
             Net n;
             if (nn.name.equals("$PACKER_VCC_NET")) {
-                n = new Net("GLOBAL_LOGIC1", edif_vcc);
+                n = new Net("GLOBAL_LOGIC1", NetType.GND);
                 des.addNet(n);
             } else if (nn.name.equals("$PACKER_GND_NET")) {
-                n = new Net("GLOBAL_LOGIC0", edif_gnd);
+                n = new Net("GLOBAL_LOGIC0", NetType.VCC);
                 des.addNet(n);
             } else if (nn.name.contains("$subnet$")) {
-                n = new Net(escape_name(nn.name), (EDIFNet)null);
+                n = new Net(escape_name(nn.name), NetType.WIRE);
                 des.addNet(n);
             } else {
-                n = new Net(escape_name(nn.name), new EDIFNet(escape_name(nn.name), des.getTopEDIFCell()));
+                n = new Net(escape_name(nn.name), NetType.UNKNOWN);
                 des.addNet(n);
             }
             nn.rwNet = n;
@@ -428,7 +426,7 @@ else if (unitype == Unisim.FDCE_1)
                         // Special case where no logical pin exists, mostly where we tie A6 high for a fractured LUT
                         BELPin belPin = usr.cell.rwCell.getBEL().getPin(usr.name);
                         if (belPin != null && belPin.getConnectedSitePinName() != null) {
-                            n.createPin(false, belPin.getConnectedSitePinName(), usr.cell.rwCell.getSiteInst());
+                            n.createPin(belPin.getConnectedSitePinName(), usr.cell.rwCell.getSiteInst());
                         }
                     }