diff --git a/src/main/scala/vexriscv/demo/Linux.scala b/src/main/scala/vexriscv/demo/Linux.scala
index ff3fa0e..c9fa9e3 100644
--- a/src/main/scala/vexriscv/demo/Linux.scala
+++ b/src/main/scala/vexriscv/demo/Linux.scala
@@ -131,7 +131,7 @@ object LinuxGen {
             twoCycleCache = true
 //          )
           ),
-          memoryTranslatorPortConfig = MmuPortConfig(
+          memoryTranslatorPortConfig = withMmu generate MmuPortConfig(
             portTlbSize = 4
           )
         ),
diff --git a/src/main/scala/vexriscv/plugin/DBusSimplePlugin.scala b/src/main/scala/vexriscv/plugin/DBusSimplePlugin.scala
index 7981850..a59e79d 100644
--- a/src/main/scala/vexriscv/plugin/DBusSimplePlugin.scala
+++ b/src/main/scala/vexriscv/plugin/DBusSimplePlugin.scala
@@ -280,7 +280,7 @@ class DBusSimplePlugin(catchAddressMisaligned : Boolean = false,
           MEMORY_ATOMIC -> True
         )
       )
-      //TODO probably the cached implemention of SC is bugy (address calculation)
+
       decoderService.add(
         key = SC,
         values = storeActions.filter(_._1 != SRC2_CTRL) ++ Seq(