diff --git a/library/xilinx/axi_adxcvr/axi_adxcvr_es.v b/library/xilinx/axi_adxcvr/axi_adxcvr_es.v
index d090ebcc7..6b98507fd 100644
--- a/library/xilinx/axi_adxcvr/axi_adxcvr_es.v
+++ b/library/xilinx/axi_adxcvr/axi_adxcvr_es.v
@@ -90,12 +90,12 @@ module axi_adxcvr_es (
 
   // addresses
 
-  localparam  [11:0]  ES_DRP_CTRL_ADDR    = (XCVR_TYPE != 0) ? 12'h03c : 12'h03d; // GTH-7 12'h03d
-  localparam  [11:0]  ES_DRP_HOFFSET_ADDR = (XCVR_TYPE != 0) ? 12'h04f : 12'h03c; // GTH-7 12'h03c
-  localparam  [11:0]  ES_DRP_VOFFSET_ADDR = (XCVR_TYPE != 0) ? 12'h097 : 12'h03b; // GTH-7 12'h03b
-  localparam  [11:0]  ES_DRP_STATUS_ADDR  = (XCVR_TYPE != 0) ? 12'h153 : 12'h151; // GTH-7 12'h153
-  localparam  [11:0]  ES_DRP_SCNT_ADDR    = (XCVR_TYPE != 0) ? 12'h152 : 12'h150; // GTH-7 12'h152
-  localparam  [11:0]  ES_DRP_ECNT_ADDR    = (XCVR_TYPE != 0) ? 12'h151 : 12'h14f; // GTH-7 12'h151
+  localparam  [11:0]  ES_DRP_CTRL_ADDR    = (XCVR_TYPE == 0) ? 12'h03d : (XCVR_TYPE == 1) ? 12'h03c : 12'h03c;
+  localparam  [11:0]  ES_DRP_HOFFSET_ADDR = (XCVR_TYPE == 0) ? 12'h03c : (XCVR_TYPE == 1) ? 12'h04f : 12'h04f;
+  localparam  [11:0]  ES_DRP_VOFFSET_ADDR = (XCVR_TYPE == 0) ? 12'h03b : (XCVR_TYPE == 1) ? 12'h097 : 12'h097;
+  localparam  [11:0]  ES_DRP_STATUS_ADDR  = (XCVR_TYPE == 0) ? 12'h151 : (XCVR_TYPE == 1) ? 12'h153 : 12'h253;
+  localparam  [11:0]  ES_DRP_SCNT_ADDR    = (XCVR_TYPE == 0) ? 12'h150 : (XCVR_TYPE == 1) ? 12'h152 : 12'h252;
+  localparam  [11:0]  ES_DRP_ECNT_ADDR    = (XCVR_TYPE == 0) ? 12'h14f : (XCVR_TYPE == 1) ? 12'h151 : 12'h251;
 
   // fsm-states
 
diff --git a/library/xilinx/util_adxcvr/util_adxcvr_xch.v b/library/xilinx/util_adxcvr/util_adxcvr_xch.v
index 6e623b1ff..e86641298 100644
--- a/library/xilinx/util_adxcvr/util_adxcvr_xch.v
+++ b/library/xilinx/util_adxcvr/util_adxcvr_xch.v
@@ -860,11 +860,11 @@ module util_adxcvr_xch #(
     .ES_QUALIFIER2 (16'h0000),
     .ES_QUALIFIER3 (16'h0000),
     .ES_QUALIFIER4 (16'h0000),
-    .ES_QUAL_MASK0 (16'h0000),
-    .ES_QUAL_MASK1 (16'h0000),
-    .ES_QUAL_MASK2 (16'h0000),
-    .ES_QUAL_MASK3 (16'h0000),
-    .ES_QUAL_MASK4 (16'h0000),
+    .ES_QUAL_MASK0 (16'hffff),
+    .ES_QUAL_MASK1 (16'hffff),
+    .ES_QUAL_MASK2 (16'hffff),
+    .ES_QUAL_MASK3 (16'hffff),
+    .ES_QUAL_MASK4 (16'hffff),
     .ES_SDATA_MASK0 (16'h0000),
     .ES_SDATA_MASK1 (16'h0000),
     .ES_SDATA_MASK2 (16'hff00),
@@ -1636,16 +1636,16 @@ module util_adxcvr_xch #(
     .ES_QUALIFIER7 (16'b0000000000000000),
     .ES_QUALIFIER8 (16'b0000000000000000),
     .ES_QUALIFIER9 (16'b0000000000000000),
-    .ES_QUAL_MASK0 (16'b0000000000000000),
-    .ES_QUAL_MASK1 (16'b0000000000000000),
-    .ES_QUAL_MASK2 (16'b0000000000000000),
-    .ES_QUAL_MASK3 (16'b0000000000000000),
-    .ES_QUAL_MASK4 (16'b0000000000000000),
-    .ES_QUAL_MASK5 (16'b0000000000000000),
-    .ES_QUAL_MASK6 (16'b0000000000000000),
-    .ES_QUAL_MASK7 (16'b0000000000000000),
-    .ES_QUAL_MASK8 (16'b0000000000000000),
-    .ES_QUAL_MASK9 (16'b0000000000000000),
+    .ES_QUAL_MASK0 (16'b1111111111111111),
+    .ES_QUAL_MASK1 (16'b1111111111111111),
+    .ES_QUAL_MASK2 (16'b1111111111111111),
+    .ES_QUAL_MASK3 (16'b1111111111111111),
+    .ES_QUAL_MASK4 (16'b1111111111111111),
+    .ES_QUAL_MASK5 (16'b1111111111111111),
+    .ES_QUAL_MASK6 (16'b1111111111111111),
+    .ES_QUAL_MASK7 (16'b1111111111111111),
+    .ES_QUAL_MASK8 (16'b1111111111111111),
+    .ES_QUAL_MASK9 (16'b1111111111111111),
     .ES_SDATA_MASK0 (16'b1111111111111111),
     .ES_SDATA_MASK1 (16'b1111111111111111),
     .ES_SDATA_MASK2 (16'b0000000011111111),