diff --git a/kernel/src/arch/hosted/process.rs b/kernel/src/arch/hosted/process.rs
index 12742ed48..88fe0f3d2 100644
--- a/kernel/src/arch/hosted/process.rs
+++ b/kernel/src/arch/hosted/process.rs
@@ -9,7 +9,8 @@ use std::net::TcpStream;
 use std::thread_local;
 use xous_kernel::{ProcessInit, ProcessKey, ThreadInit, PID, TID};
 
-pub const INITIAL_TID: usize = 1;
+pub const INITIAL_TID: usize = 2;
+pub const EXCEPTION_TID: usize = 1;
 pub const MAX_PROCESS_COUNT: usize = 32;
 
 pub struct Process {
@@ -241,7 +242,7 @@ impl Process {
     // }
 
     /// Set the current context number.
-    pub fn set_thread(&mut self, thread: TID) -> Result<(), xous_kernel::Error> {
+    pub fn set_tid(&mut self, thread: TID) -> Result<(), xous_kernel::Error> {
         assert!(thread > 0);
         PROCESS_TABLE.with(|pt| {
             let mut process_table = pt.borrow_mut();
diff --git a/kernel/src/services.rs b/kernel/src/services.rs
index ffd0361f6..f5fa9581f 100644
--- a/kernel/src/services.rs
+++ b/kernel/src/services.rs
@@ -250,7 +250,7 @@ std::thread_local!(static SYSTEM_SERVICES: core::cell::RefCell<SystemServices> =
         mapping: arch::mem::DEFAULT_MEMORY_MAPPING,
         current_thread: 0 as TID,
         previous_thread: INITIAL_TID as TID,
-        exception_thread: None,
+        exception_handler: None,
     }; MAX_PROCESS_COUNT],
     // Note we can't use MAX_SERVER_COUNT here because of how Rust's
     // macro tokenization works