diff --git a/repos/mml/run/thread_test.run b/repos/mml/run/thread_test.run
index 08bae0b68e..05aec30223 100644
--- a/repos/mml/run/thread_test.run
+++ b/repos/mml/run/thread_test.run
@@ -37,7 +37,7 @@ install_config {
     </config>
 }
 set boot_modules { 
-    core init timer vfs.lib.so ld.lib.so thread_test
+    core init timer vfs.lib.so ld.lib.so libm.lib.so libc.lib.so stdcxx.lib.so thread_test
 }
 build_boot_image $boot_modules
 append qemu_args "-nographic -m 64"
diff --git a/repos/mml/src/app/thread_test/target.mk b/repos/mml/src/app/thread_test/target.mk
index c49034cd6b..79ffb18ea9 100644
--- a/repos/mml/src/app/thread_test/target.mk
+++ b/repos/mml/src/app/thread_test/target.mk
@@ -1,4 +1,4 @@
 TARGET = thread_test
 SRC_CC = thread_test.cc 
-LIBS += base 
+LIBS += base stdcxx 
 CXXFLAGS += -Wno-error
diff --git a/repos/mml/src/app/thread_test/thread_test.cc b/repos/mml/src/app/thread_test/thread_test.cc
index 24107899cb..08d7f4c4df 100644
--- a/repos/mml/src/app/thread_test/thread_test.cc
+++ b/repos/mml/src/app/thread_test/thread_test.cc
@@ -50,7 +50,7 @@ public:
 
         for (unsigned i = 0; i < space.total(); i++) {
             Affinity::Location location = env.cpu().affinity_space().location_of_index(i);
-            Test_thread *thread = new (_heap) Test_thread(env, i, location);
+            Test_thread *thread = new (_heap) Test_thread(env, (uint16_t)i, location);
             thread->start();
 
             _threads.insert(&thread->_list_element);