diff --git a/src/Helpers/BiMap.hpp b/src/Helpers/BiMap.hpp
index cbd96833..348ce16d 100644
--- a/src/Helpers/BiMap.hpp
+++ b/src/Helpers/BiMap.hpp
@@ -68,7 +68,7 @@ namespace Bloom
             return this->flippedMap.at(key);
         }
 
-        std::unordered_map<TypeA, TypeB> getMap() {
+        std::unordered_map<TypeA, TypeB> getMap() const {
             return this->map;
         }
 
diff --git a/src/Targets/TargetRegister.hpp b/src/Targets/TargetRegister.hpp
index a056a718..d9eda420 100644
--- a/src/Targets/TargetRegister.hpp
+++ b/src/Targets/TargetRegister.hpp
@@ -47,14 +47,13 @@ namespace Bloom::Targets
         bool operator < (const TargetRegisterDescriptor& other) const {
             if (this->type == other.type) {
                 return this->startAddress.value_or(0) < other.startAddress.value_or(0);
-
-            } else {
-                /*
-                 * If the registers are of different type, there is no meaningful way to sort them, so we just use
-                 * the unique hash.
-                 */
-                return this->getHash() < other.getHash();
             }
+
+            /*
+             * If the registers are of different type, there is no meaningful way to sort them, so we just use
+             * the unique hash.
+             */
+            return this->getHash() < other.getHash();
         }
 
     private: