diff --git a/pw_thread_zephyr/public/pw_thread_zephyr/context.h b/pw_thread_zephyr/public/pw_thread_zephyr/context.h
index bbdfede17..086050dee 100644
--- a/pw_thread_zephyr/public/pw_thread_zephyr/context.h
+++ b/pw_thread_zephyr/public/pw_thread_zephyr/context.h
@@ -94,7 +94,7 @@ class StaticContext : public Context {
       : stack_(stack), available_stack_size_(available_stack_size) {}
 
  private:
-  friend Thread;
+  friend Context;
 
   z_thread_stack_element* stack() { return stack_; }
   size_t available_stack_size() { return available_stack_size_; }
diff --git a/pw_thread_zephyr/thread.cc b/pw_thread_zephyr/thread.cc
index 9ea5a840c..284099bcd 100644
--- a/pw_thread_zephyr/thread.cc
+++ b/pw_thread_zephyr/thread.cc
@@ -63,7 +63,7 @@ void Context::CreateThread(const zephyr::Options& options,
   native_type_out->set_thread_done(false);
 
   native_type_out->set_thread_routine(std::move(thread_fn));
-  native_type_out->const k_tid_t task_handle =
+  const k_tid_t task_handle =
       k_thread_create(&native_type_out->thread_info(),
                       options.static_context()->stack(),
                       options.static_context()->available_stack_size(),