diff --git a/src/syscall/debug.rs b/src/syscall/debug.rs
index aaed92ab6a..f600259d51 100644
--- a/src/syscall/debug.rs
+++ b/src/syscall/debug.rs
@@ -219,35 +219,27 @@ impl SyscallDebugInfo {
 }
 #[cfg(feature = "syscall_debug")]
 pub fn debug_start([a, b, c, d, e, f]: [usize; 6]) {
-    let do_debug = {
-        let contexts = crate::context::contexts();
-        if let Some(context_lock) = contexts.current() {
-            let context = context_lock.read();
-            if context.name.contains("xhcid") {
-                if a == SYS_CLOCK_GETTIME || a == SYS_YIELD || a == SYS_FUTEX {
-                    false
-                } else if (a == SYS_WRITE || a == SYS_FSYNC) && (b == 1 || b == 2) {
-                    false
-                } else {
-                    true
-                }
-            } else {
-                false
-            }
-        } else {
+    let do_debug = if crate::context::current().read().name.contains("sigchld") {
+        if a == SYS_CLOCK_GETTIME || a == SYS_YIELD || a == SYS_FUTEX {
             false
+        } else if (a == SYS_WRITE || a == SYS_FSYNC) && (b == 1 || b == 2) {
+            false
+        } else {
+            true
         }
+    } else {
+        false
     };
 
     let debug_start = if do_debug {
-        let contexts = crate::context::contexts();
-        if let Some(context_lock) = contexts.current() {
+        let context_lock = crate::context::current();
+        {
             let context = context_lock.read();
             print!(
-                "{} ({}/{}): ",
+                "{} ({}/{:p}): ",
                 context.name,
                 context.pid.get(),
-                context.cid.get()
+                context_lock,
             );
         }
 
@@ -281,14 +273,14 @@ pub fn debug_end([a, b, c, d, e, f]: [usize; 6], result: Result<usize>) {
     let debug_duration =
         debug_info.accumulated_time + (crate::time::monotonic() - debug_info.this_switch_time);
 
-    let contexts = crate::context::contexts();
-    if let Some(context_lock) = contexts.current() {
+    let context_lock = crate::context::current();
+    {
         let context = context_lock.read();
         print!(
-            "{} ({}/{}): ",
+            "{} ({}/{:p}): ",
             context.name,
             context.pid.get(),
-            context.cid.get()
+            context_lock,
         );
     }
 
diff --git a/src/syscall/process.rs b/src/syscall/process.rs
index f17423c7b3..bf84232139 100644
--- a/src/syscall/process.rs
+++ b/src/syscall/process.rs
@@ -282,7 +282,6 @@ pub fn send_signal(
                     }
                     tctl.word[0].fetch_and(!sig_bit(SIGCONT), Ordering::Relaxed);
                 }
-                thread.unblock();
             }
 
             return Sent::SucceededSigchld {
@@ -348,14 +347,12 @@ pub fn send_signal(
             pgid,
             orig_signal,
         } => {
-            let waitpid = Arc::clone(
-                &process::PROCESSES
-                    .read()
-                    .get(&ppid)
-                    .ok_or(Error::new(ESRCH))?
-                    .read()
-                    .waitpid,
-            );
+            let parent = process::PROCESSES
+                .read()
+                .get(&ppid)
+                .map(Arc::clone)
+                .ok_or(Error::new(ESRCH))?;
+            let waitpid = Arc::clone(&parent.read().waitpid);
             waitpid.send(
                 WaitpidKey {
                     pid: Some(proc_info.pid),
@@ -363,11 +360,6 @@ pub fn send_signal(
                 },
                 (proc_info.pid, (orig_signal << 8) | 0x7f),
             );
-            let parent = process::PROCESSES
-                .read()
-                .get(&ppid)
-                .map(Arc::clone)
-                .ok_or(Error::new(ESRCH))?;
             send_signal(KillTarget::Process(parent), SIGCHLD, true, killed_self)?;
         }
         Sent::SucceededSigcont { ppid, pgid } => {