diff --git a/src/com/xilinx/rapidwright/edif/EDIFTools.java b/src/com/xilinx/rapidwright/edif/EDIFTools.java
index 1c997a8bc..bc3ced3db 100644
--- a/src/com/xilinx/rapidwright/edif/EDIFTools.java
+++ b/src/com/xilinx/rapidwright/edif/EDIFTools.java
@@ -1019,7 +1019,7 @@ public static void writeTclLoadScriptForPartialEncryptedDesigns(EDIFNetlist edif
         lines.add("read_checkpoint {" + pathDCPFileName + "}");
         lines.add("set_property top "+edif.getName()+" [current_fileset]");
         lines.add("link_design -part " + partName);
-        Path tclFileName = FileTools.replaceExtension(pathDCPFileName.getFileName(), LOAD_TCL_SUFFIX);
+        Path tclFileName = FileTools.replaceExtension(pathDCPFileName, LOAD_TCL_SUFFIX);
         try {
             Files.write(tclFileName, lines);
         } catch (IOException e) {
diff --git a/src/com/xilinx/rapidwright/util/Utils.java b/src/com/xilinx/rapidwright/util/Utils.java
index 0597aa1e6..6d3b5fa4e 100644
--- a/src/com/xilinx/rapidwright/util/Utils.java
+++ b/src/com/xilinx/rapidwright/util/Utils.java
@@ -384,6 +384,9 @@ public static boolean isIOB(SiteTypeEnum s) {
             SiteTypeEnum.IOB,
             SiteTypeEnum.IOBM,
             SiteTypeEnum.IOBS,
+            SiteTypeEnum.HDIOB,
+            SiteTypeEnum.HDIOB_M,
+            SiteTypeEnum.HDIOB_S,
             SiteTypeEnum.HPIOB,
             SiteTypeEnum.HPIOB_M,
             SiteTypeEnum.HPIOB_S,
diff --git a/src/com/xilinx/rapidwright/util/VivadoTools.java b/src/com/xilinx/rapidwright/util/VivadoTools.java
index 67ca7b5de..40ae8aa77 100644
--- a/src/com/xilinx/rapidwright/util/VivadoTools.java
+++ b/src/com/xilinx/rapidwright/util/VivadoTools.java
@@ -305,7 +305,7 @@ public static String reportRouteStatus(String netName, Path dcp, Path workdir, b
 
     private static String createTclDCPLoadCommand(Path dcp, boolean encrypted) {
         if (encrypted) {
-            Path tclFileName = FileTools.replaceExtension(dcp.getFileName(), EDIFTools.LOAD_TCL_SUFFIX);
+            Path tclFileName = FileTools.replaceExtension(dcp, EDIFTools.LOAD_TCL_SUFFIX);
             return "source {" + tclFileName + "}; ";
         } else {
             return "open_checkpoint {" + dcp + "}; ";