diff --git a/project.raddbg b/project.raddbg
index 0e4d6ca1..d14d1956 100755
--- a/project.raddbg
+++ b/project.raddbg
@@ -7,19 +7,18 @@ target:
   working_directory: build
   arguments: "--user:raddbg_test.user"
   debug_subprocesses: 0
-  enabled: 1
 }
 target:
 {
   executable: "build/raddbg_server.exe"
   working_directory: build
   debug_subprocesses: 1
-  enabled: 1
 }
 target:
 {
   executable: "build/metagen.exe"
   working_directory: build
+  enabled: 1
 }
 target:
 {
diff --git a/src/dbg_engine/dbg_engine_ctrl.c b/src/dbg_engine/dbg_engine_ctrl.c
index 033b7651..cec6be92 100644
--- a/src/dbg_engine/dbg_engine_ctrl.c
+++ b/src/dbg_engine/dbg_engine_ctrl.c
@@ -3201,10 +3201,12 @@ d_ctrl_thread__next_dmn_event(Arena *arena, DMN_CtrlCtx *ctrl_ctx, D_Msg *msg, D
         // a halt, and we're waiting for that)
         if(events.first != 0 && events.count == 1 && events.first->v.kind == DMN_EventKind_Error && events.first->v.error_kind == DMN_ErrorKind_NotAttached)
         {
+#if 0
           for(;num_servers_running > 0;)
           {
             // TODO(rjf)
           }
+#endif
         }
         
         //- rjf: bump all debuggee state generations
diff --git a/src/dbg_info/dbg_info.c b/src/dbg_info/dbg_info.c
index 350e54d4..334946f2 100644
--- a/src/dbg_info/dbg_info.c
+++ b/src/dbg_info/dbg_info.c
@@ -1703,20 +1703,21 @@ di_match_artifact_create(String8 key, B32 *cancel_signal, AC_Status *status_out,
         RDI_SectionKind_Procedures,
         RDI_SectionKind_TypeNodes,
       };
-      Rng1U64 range = lane_range(dbgi_keys.count);
-      for EachInRange(dbgi_idx, range)
+      for EachElement(name_map_kind_idx, name_map_kinds)
       {
-        DI_Key dbgi_key = dbgi_keys.v[dbgi_idx];
-        if(!allow_other_dbgis && !di_key_match(preferred_key, dbgi_key))
+        Rng1U64 range = lane_range(dbgi_keys.count);
+        for EachInRange(dbgi_idx, range)
         {
-          continue;
-        }
-        Access *access = access_open();
-        {
-          RDI_Parsed *rdi = di_rdi_from_key(access, dbgi_key, 0, 0);
-          RDI_Unit *unit = rdi_element_from_name_idx(rdi, Units, unit_idx);
-          for EachElement(name_map_kind_idx, name_map_kinds)
+          DI_Key dbgi_key = dbgi_keys.v[dbgi_idx];
+          if(!allow_other_dbgis && !di_key_match(preferred_key, dbgi_key))
           {
+            continue;
+          }
+          Access *access = access_open();
+          {
+            RDI_Parsed *rdi = di_rdi_from_key(access, dbgi_key, 0, 0);
+            RDI_Unit *unit = rdi_element_from_name_idx(rdi, Units, unit_idx);
+            
             // rjf: unpack name map
             RDI_NameMap *name_map = rdi_element_from_name_idx(rdi, NameMaps, name_map_kinds[name_map_kind_idx]);
             RDI_ParsedNameMap parsed_name_map = {0};
@@ -1821,8 +1822,8 @@ di_match_artifact_create(String8 key, B32 *cancel_signal, AC_Status *status_out,
               lane_matches[lane_idx()].count        = filtered_matches_count;
             }
           }
+          access_close(access);
         }
-        access_close(access);
       }
     }
   }
diff --git a/src/socket/socket.c b/src/socket/socket.c
index 0580d4c7..5b63263f 100644
--- a/src/socket/socket.c
+++ b/src/socket/socket.c
@@ -129,4 +129,5 @@ internal B32
 sock_endpoint_match(SOCK_Endpoint a, SOCK_Endpoint b)
 {
   B32 result = (a.port == b.port && a.kind == b.kind && MemoryMatchArray(a.address_u8, b.address_u8));
+  return result;
 }