diff --git a/uncore/src/main/scala/converters/Nasti.scala b/uncore/src/main/scala/converters/Nasti.scala
index 006485ca..2f31d9d6 100644
--- a/uncore/src/main/scala/converters/Nasti.scala
+++ b/uncore/src/main/scala/converters/Nasti.scala
@@ -319,7 +319,7 @@ class TileLinkIONastiIOConverter(implicit p: Parameters) extends TLModule()(p)
       addr_block = nasti_addr_block(aw_req),
       addr_beat = put_count,
       data = io.nasti.w.bits.data,
-      wmask = io.nasti.w.bits.strb),
+      wmask = Some(io.nasti.w.bits.strb)),
     Put(
       client_xact_id = aw_req.id,
       addr_block = nasti_addr_block(aw_req),
diff --git a/uncore/src/main/scala/converters/Tilelink.scala b/uncore/src/main/scala/converters/Tilelink.scala
index 4899f05d..e3cd4474 100644
--- a/uncore/src/main/scala/converters/Tilelink.scala
+++ b/uncore/src/main/scala/converters/Tilelink.scala
@@ -107,8 +107,7 @@ class ClientTileLinkIOUnwrapper(implicit p: Parameters) extends TLModule()(p) {
     client_xact_id = irel.client_xact_id,
     addr_block = irel.addr_block,
     addr_beat = irel.addr_beat,
-    data = irel.data,
-    wmask = Acquire.fullWriteMask)
+    data = irel.data)
   io.in.release.ready := rel_helper.fire(io.in.release.valid)
 
   io.out.acquire <> acqArb.io.out
@@ -264,7 +263,7 @@ class TileLinkIOWidener(innerTLId: String, outerTLId: String)
     addr_block = put_block,
     addr_beat = put_beat,
     data = put_data.toBits,
-    wmask = put_wmask.toBits)
+    wmask = Some(put_wmask.toBits))
 
   io.out.acquire.valid := sending_put || (!shrink && io.in.acquire.valid)
   io.out.acquire.bits := MuxCase(get_block_acquire, Seq(
@@ -444,7 +443,7 @@ class TileLinkIONarrower(innerTLId: String, outerTLId: String)
                   Cat(acq_addr_beat, oacq_ctr.value)
                 else acq_addr_beat,
     data = acq_data_buffer(outerDataBits - 1, 0),
-    wmask = acq_wmask_buffer(outerWriteMaskBits - 1, 0))(outerConfig)
+    wmask = Some(acq_wmask_buffer(outerWriteMaskBits - 1, 0)))(outerConfig)
 
   val get_acquire = Get(
     client_xact_id = iacq.client_xact_id,
diff --git a/uncore/src/main/scala/devices/Dma.scala b/uncore/src/main/scala/devices/Dma.scala
index eadff9d7..036bf95b 100644
--- a/uncore/src/main/scala/devices/Dma.scala
+++ b/uncore/src/main/scala/devices/Dma.scala
@@ -354,7 +354,7 @@ class DmaTracker(implicit p: Parameters) extends DmaModule()(p)
     addr_block = dst_block,
     addr_beat = put_beat,
     data = put_data,
-    wmask = put_mask)
+    wmask = Some(put_mask))
 
   val get_acquire = GetBlock(
     client_xact_id = get_half,
diff --git a/uncore/src/main/scala/tilelink/Definitions.scala b/uncore/src/main/scala/tilelink/Definitions.scala
index 1917e403..dd16e1e8 100644
--- a/uncore/src/main/scala/tilelink/Definitions.scala
+++ b/uncore/src/main/scala/tilelink/Definitions.scala
@@ -585,22 +585,7 @@ object PutBlock {
         addr_block: UInt,
         addr_beat: UInt,
         data: UInt,
-        wmask: UInt)
-      (implicit p: Parameters): Acquire = {
-    BuiltInAcquireBuilder(
-      a_type = Acquire.putBlockType,
-      client_xact_id = client_xact_id,
-      addr_block = addr_block,
-      addr_beat = addr_beat,
-      data = data,
-      wmask = wmask,
-      alloc = Bool(true))
-  }
-  def apply(
-        client_xact_id: UInt,
-        addr_block: UInt,
-        addr_beat: UInt,
-        data: UInt,
+        wmask: Option[UInt] = None,
         alloc: Bool = Bool(true))
       (implicit p: Parameters): Acquire = {
     BuiltInAcquireBuilder(
@@ -609,7 +594,7 @@ object PutBlock {
       addr_block = addr_block,
       addr_beat = addr_beat,
       data = data,
-      wmask = Acquire.fullWriteMask,
+      wmask = wmask.getOrElse(Acquire.fullWriteMask),
       alloc = alloc)
   }
 }