diff --git a/src/arch/x86/isa/decoder.isa b/src/arch/x86/isa/decoder/decoder.isa
similarity index 100%
rename from src/arch/x86/isa/decoder.isa
rename to src/arch/x86/isa/decoder/decoder.isa
diff --git a/src/base/bitfield.hh b/src/base/bitfield.hh
index ca0c06770f..69cce22459 100644
--- a/src/base/bitfield.hh
+++ b/src/base/bitfield.hh
@@ -157,7 +157,7 @@ namespace BitfieldBackend
         //responsibility to make sure that there is a properly overloaded
         //version of this function for whatever type they want to overlay.
         inline uint64_t
-        getBits(int first, int last)
+        getBits(int first, int last) const
         {
             return bits(__data, first, last);
         }