diff --git a/src/main/scala/groundtest/Tile.scala b/src/main/scala/groundtest/Tile.scala
index 43b0390a..f0973dc4 100644
--- a/src/main/scala/groundtest/Tile.scala
+++ b/src/main/scala/groundtest/Tile.scala
@@ -96,9 +96,9 @@ abstract class GroundTest(implicit val p: Parameters) extends Module
   val io = new GroundTestIO
 }
 
-class GroundTestTile(implicit val p: Parameters) extends LazyTile with HasGroundTestParameters {
+class GroundTestTile(implicit val p: Parameters) extends LazyTile {
   val slave = None
-  lazy val module = new TileImp(this) {
+  lazy val module = new TileImp(this) with HasGroundTestParameters {
     val io = new TileIO(bc) {
       val success = Bool(OUTPUT)
     }
diff --git a/src/main/scala/rocket/tile.scala b/src/main/scala/rocket/tile.scala
index 931de47f..c71848bb 100644
--- a/src/main/scala/rocket/tile.scala
+++ b/src/main/scala/rocket/tile.scala
@@ -40,7 +40,7 @@ class TileIO(c: TileBundleConfig, node: Option[TLInwardNode] = None)(implicit p:
   override def cloneType = new TileIO(c).asInstanceOf[this.type]
 }
 
-abstract class TileImp(l: LazyTile)(implicit p: Parameters) extends LazyModuleImp(l) {
+abstract class TileImp(l: LazyTile)(implicit val p: Parameters) extends LazyModuleImp(l) {
   val io: TileIO
 }
 
diff --git a/src/main/scala/uncore/tilelink2/Legacy.scala b/src/main/scala/uncore/tilelink2/Legacy.scala
index 252d77ea..3fa75774 100644
--- a/src/main/scala/uncore/tilelink2/Legacy.scala
+++ b/src/main/scala/uncore/tilelink2/Legacy.scala
@@ -38,11 +38,9 @@ class TLLegacy(implicit val p: Parameters) extends LazyModule with HasTileLinkPa
         require (m.supportsPutPartial.contains(TransferSizes(1, tlDataBytes)))
         require (m.supportsPutPartial.contains(TransferSizes(tlDataBeats * tlDataBytes)))
       }
-      // Any atomic support => must support 32-bit up to beat size of all types
-      if (m.supportsArithmetic || m.supportsLogical) {
-        require (m.supportsArithmetic.contains(TransferSizes(4, tlDataBytes)))
-        require (m.supportsLogical   .contains(TransferSizes(4, tlDataBytes)))
-      }
+      // Any atomic support => must support 32-bit size
+      if (m.supportsArithmetic) { require (m.supportsArithmetic.contains(TransferSizes(4))) }
+      if (m.supportsLogical)    { require (m.supportsLogical   .contains(TransferSizes(4))) }
       // We straight-up require hints
       require (edge.manager.allSupportHint)
     }