diff --git a/mpact/sim/decoder/test/push_pop_encoding.cc b/mpact/sim/decoder/test/push_pop_encoding.cc
index 487e8c2..142df85 100644
--- a/mpact/sim/decoder/test/push_pop_encoding.cc
+++ b/mpact/sim/decoder/test/push_pop_encoding.cc
@@ -126,7 +126,7 @@
         result.push_back(GetRegisterSourceOp<TestRegister>(state_, "x25"));
         if (rlist == 14) return result;
         result.push_back(GetRegisterSourceOp<TestRegister>(state_, "x26"));
-        result.push_back(GetRegisterSourceOp<TestRegister>(state_, "x26"));
+        result.push_back(GetRegisterSourceOp<TestRegister>(state_, "x27"));
         return result;
       }));
 
@@ -181,7 +181,7 @@
                        result.push_back(GetRegisterDestinationOp<TestRegister>(
                            state_, "x26", latency[result.size() % size]));
                        result.push_back(GetRegisterDestinationOp<TestRegister>(
-                           state_, "x26", latency[result.size() % size]));
+                           state_, "x27", latency[result.size() % size]));
                        return result;
                      }));
 }
diff --git a/mpact/sim/generic/data_buffer.cc b/mpact/sim/generic/data_buffer.cc
index fbaae4c..58cd2f5 100644
--- a/mpact/sim/generic/data_buffer.cc
+++ b/mpact/sim/generic/data_buffer.cc
@@ -16,8 +16,6 @@
 
 #include <cstdint>
 
-#include "mpact/sim/generic/state_item_base.h"
-
 namespace mpact {
 namespace sim {
 namespace generic {