diff --git a/src/ld_so/linker.rs b/src/ld_so/linker.rs
index a1a517f789f0588ff7de274f44f69f2f7ffe4347..210f8cdbba3de4fc19d0bff28c6652da96de0df0 100644
--- a/src/ld_so/linker.rs
+++ b/src/ld_so/linker.rs
@@ -83,7 +83,9 @@ impl Linker {
                     obj.use_count += 1;
                     return Ok(*id);
                 } else {
-                    let parent_runpath = &self.objects.get(&root_id).unwrap().runpath.clone();
+                    let parent_runpath = &self.objects.get(&root_id).and_then(|parent| {
+                        parent.runpath.clone()
+                    });
                     let lib_id = self.next_object_id;
                     self.load_object(name, parent_runpath, None, true)?;
 
diff --git a/src/start.rs b/src/start.rs
index 3c297a831f5f43f41bec8276177b7c966c3fb12f..c03af9c56b7434a90a01de2737a9358f306e6a09 100644
--- a/src/start.rs
+++ b/src/start.rs
@@ -1,10 +1,11 @@
-use alloc::vec::Vec;
+use alloc::{boxed::Box, vec::Vec};
 use core::{intrinsics, ptr};
 
 use crate::{
     header::{libgen, stdio, stdlib},
-    ld_so,
+    ld_so::{self, linker::Linker},
     platform::{self, get_auxvs, new_mspace, types::*, Pal, Sys},
+    sync::mutex::Mutex,
     ALLOCATOR,
 };
 
@@ -162,6 +163,19 @@ pub unsafe extern "C" fn relibc_start(sp: &'static Stack) -> ! {
     // if any memory rust based memory allocation happen before this step .. we are doomed.
     alloc_init();
 
+    if let Some(tcb) = ld_so::tcb::Tcb::current() {
+        // Update TCB mspace
+        tcb.mspace = ALLOCATOR.get_book_keeper();
+
+        // Set linker pointer if necessary
+        if tcb.linker_ptr.is_null() {
+            //TODO: get ld path
+            let linker = Linker::new(None);
+            //TODO: load root object
+            tcb.linker_ptr = Box::into_raw(Box::new(Mutex::new(linker)));
+        }
+    }
+
     // Set up argc and argv
     let argc = sp.argc;
     let argv = sp.argv();