diff --git a/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala b/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala
index 7cc1651..78b1ddd 100644
--- a/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala
+++ b/src/main/scala/vexriscv/demo/smp/VexRiscvSmpCluster.scala
@@ -128,7 +128,7 @@ object VexRiscvSmpClusterGen {
           historyRamSizeLog2 = 9,
           relaxPredictorAddress = true,
           injectorStage = false,
-          relaxedPcCalculation = true,
+          relaxedPcCalculation = false,
           config = InstructionCacheConfig(
             cacheSize = 4096*2,
             bytePerLine = 64,
@@ -191,7 +191,7 @@ object VexRiscvSmpClusterGen {
         new SrcPlugin(
           separatedAddSub = false
         ),
-        new FullBarrelShifterPlugin(earlyInjection = false),
+        new FullBarrelShifterPlugin(earlyInjection = true),
         //        new LightShifterPlugin,
         new HazardSimplePlugin(
           bypassExecute           = true,