diff --git a/basis/concurrency/locks/locks-tests.factor b/basis/concurrency/locks/locks-tests.factor
index 659bd2714e..92dede1655 100755
--- a/basis/concurrency/locks/locks-tests.factor
+++ b/basis/concurrency/locks/locks-tests.factor
@@ -1,7 +1,7 @@
 IN: concurrency.locks.tests
 USING: tools.test concurrency.locks concurrency.count-downs
 concurrency.messaging concurrency.mailboxes locals kernel
-threads sequences calendar ;
+threads sequences calendar accessors ;
 
 :: lock-test-0 ( -- )
     [let | v [ V{ } clone ]
@@ -174,7 +174,7 @@ threads sequences calendar ;
     ] ;
 
 [ lock-timeout-test ] [
-    linked-error-thread thread-name "Lock timeout-er" =
+    linked-error-thread name>> "Lock timeout-er" =
 ] must-fail-with
 
 :: read/write-test ( -- )
diff --git a/basis/concurrency/messaging/messaging.factor b/basis/concurrency/messaging/messaging.factor
index 810e4430f1..7173e8f408 100755
--- a/basis/concurrency/messaging/messaging.factor
+++ b/basis/concurrency/messaging/messaging.factor
@@ -10,8 +10,8 @@ IN: concurrency.messaging
 GENERIC: send ( message thread -- )
 
 : mailbox-of ( thread -- mailbox )
-    dup thread-mailbox [ ] [
-        <mailbox> dup rot set-thread-mailbox
+    dup mailbox>> [ ] [
+        <mailbox> swap >>mailbox
     ] ?if ;
 
 M: thread send ( message thread -- )