diff --git a/libs/libarchopenfpga/CMakeLists.txt b/libs/libarchopenfpga/CMakeLists.txt
index 93c20710d6..13b4431f10 100644
--- a/libs/libarchopenfpga/CMakeLists.txt
+++ b/libs/libarchopenfpga/CMakeLists.txt
@@ -20,6 +20,7 @@ set_target_properties(libarchopenfpga PROPERTIES PREFIX "") #Avoid extra 'lib' p
 #Specify link-time dependancies
 target_link_libraries(libarchopenfpga
                       libopenfpgautil
+                      libopenfpgashell
                       libvtrutil
                       libarchfpga
                       libpugiutil)
diff --git a/libs/libarchopenfpga/src/tile_annotation.cpp b/libs/libarchopenfpga/src/tile_annotation.cpp
index d9ac5c0f56..0ea6c5d8d5 100644
--- a/libs/libarchopenfpga/src/tile_annotation.cpp
+++ b/libs/libarchopenfpga/src/tile_annotation.cpp
@@ -23,7 +23,7 @@ TileAnnotation::global_port_range TileAnnotation::global_ports() const {
   return vtr::make_range(global_port_ids_.begin(), global_port_ids_.end());
 }
 
-std::vector<std::string> tiles_to_merge_ports() const {
+std::vector<std::string> TileAnnotation::tiles_to_merge_ports() const {
   std::vector<std::string> tile_names;
   for (auto it = tile_ports_to_merge_.begin(); it != tile_ports_to_merge_.end(); it++) {
     tile_names.push_back(it->first);
@@ -31,14 +31,14 @@ std::vector<std::string> tiles_to_merge_ports() const {
   return tile_names;
 }
 
-std::vector<std::string> tile_ports_to_merge(const std::string& tile_name) const {
+std::vector<std::string> TileAnnotation::tile_ports_to_merge(const std::string& tile_name) const {
   std::vector<std::string> port_names;
   const auto& result = tile_ports_to_merge_.find(tile_name);
-  if (result == tile_ports_to_merge.end()) {
+  if (result == tile_ports_to_merge_.end()) {
     VTR_LOG_WARN("Tile '%s' does not contain any ports to merge!\n", tile_name.c_str());
     return port_names;
   }
-  return result.second;
+  return result->second;
 }
 
 /************************************************************************
@@ -206,7 +206,7 @@ int TileAnnotation::add_merge_subtile_ports(const std::string& tile_name, const
     tile_ports_to_merge_[tile_name].push_back(port_name);
   } else {
     /* Check if the port name is already in the list, if yes, error out */
-    if (result->second.end() == std::find(result->secnd.begin(), result->second.end(), port_name)) {
+    if (result->second.end() == std::find(result->second.begin(), result->second.end(), port_name)) {
       tile_ports_to_merge_[tile_name].push_back(port_name);
     } else {
       VTR_LOG_ERROR("Port '%s' has already been defined twice for tile '%s' to be merged!", port_name.c_str(), tile_name.c_str());
diff --git a/libs/libnamemanager/test/module_rename_assistant.cpp b/libs/libnamemanager/test/module_rename_assistant.cpp
index a4e662f02b..49de367c33 100644
--- a/libs/libnamemanager/test/module_rename_assistant.cpp
+++ b/libs/libnamemanager/test/module_rename_assistant.cpp
@@ -36,7 +36,7 @@ static std::vector<std::string> format_argv(const std::string& cmd_name,
  * We want a renamed version for fabric B is
  *   <module_name default="tile_2__2_" given="tile_big"/>
  */
-int rename_module_names_for_fabricB_from_fabricA(
+static int rename_module_names_for_fabricB_from_fabricA(
   const openfpga::ModuleNameMap& refA_module_names,
   const openfpga::ModuleNameMap& renamedA_module_names,
   const openfpga::ModuleNameMap& refB_module_names,