diff --git a/Userland/DevTools/HackStudio/Debugger/Debugger.cpp b/Userland/DevTools/HackStudio/Debugger/Debugger.cpp
index a2f06beb8b..1a0dd7541f 100644
--- a/Userland/DevTools/HackStudio/Debugger/Debugger.cpp
+++ b/Userland/DevTools/HackStudio/Debugger/Debugger.cpp
@@ -84,7 +84,7 @@ Debug::DebugInfo::SourcePosition Debugger::create_source_position(const String&
     return { LexicalPath::canonicalized_path(String::formatted("{}/{}", m_source_root, file)), line + 1 };
 }
 
-int Debugger::start_static()
+intptr_t Debugger::start_static()
 {
     Debugger::the().start();
     return 0;
diff --git a/Userland/DevTools/HackStudio/Debugger/Debugger.h b/Userland/DevTools/HackStudio/Debugger/Debugger.h
index 3bbdf55f85..7ac8a61ac3 100644
--- a/Userland/DevTools/HackStudio/Debugger/Debugger.h
+++ b/Userland/DevTools/HackStudio/Debugger/Debugger.h
@@ -43,7 +43,7 @@ public:
     void stop();
 
     // Thread entry point
-    static int start_static();
+    static intptr_t start_static();
 
     pthread_mutex_t* continue_mutex() { return &m_ui_action_mutex; }
     pthread_cond_t* continue_cond() { return &m_ui_action_cond; }
diff --git a/Userland/Libraries/LibThread/BackgroundAction.cpp b/Userland/Libraries/LibThread/BackgroundAction.cpp
index 34ab7b5fcb..392141e445 100644
--- a/Userland/Libraries/LibThread/BackgroundAction.cpp
+++ b/Userland/Libraries/LibThread/BackgroundAction.cpp
@@ -12,7 +12,7 @@
 static LibThread::Lockable<Queue<Function<void()>>>* s_all_actions;
 static LibThread::Thread* s_background_thread;
 
-static int background_thread_func()
+static intptr_t background_thread_func()
 {
     while (true) {
         Function<void()> work_item;
diff --git a/Userland/Libraries/LibThread/Thread.cpp b/Userland/Libraries/LibThread/Thread.cpp
index 941ffbfea1..db3aeb0022 100644
--- a/Userland/Libraries/LibThread/Thread.cpp
+++ b/Userland/Libraries/LibThread/Thread.cpp
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <unistd.h>
 
-LibThread::Thread::Thread(Function<int()> action, StringView thread_name)
+LibThread::Thread::Thread(Function<intptr_t()> action, StringView thread_name)
     : Core::Object(nullptr)
     , m_action(move(action))
     , m_thread_name(thread_name.is_null() ? "" : thread_name)
@@ -33,9 +33,9 @@ void LibThread::Thread::start()
         nullptr,
         [](void* arg) -> void* {
             Thread* self = static_cast<Thread*>(arg);
-            int exit_code = self->m_action();
+            auto exit_code = self->m_action();
             self->m_tid = 0;
-            return (void*)exit_code;
+            return reinterpret_cast<void*>(exit_code);
         },
         static_cast<void*>(this));
 
diff --git a/Userland/Libraries/LibThread/Thread.h b/Userland/Libraries/LibThread/Thread.h
index 8696b86b46..255d8f8903 100644
--- a/Userland/Libraries/LibThread/Thread.h
+++ b/Userland/Libraries/LibThread/Thread.h
@@ -15,7 +15,7 @@
 
 namespace LibThread {
 
-TYPEDEF_DISTINCT_ORDERED_ID(int, ThreadError);
+TYPEDEF_DISTINCT_ORDERED_ID(intptr_t, ThreadError);
 
 class Thread final : public Core::Object {
     C_OBJECT(Thread);
@@ -32,8 +32,8 @@ public:
     pthread_t tid() const { return m_tid; }
 
 private:
-    explicit Thread(Function<int()> action, StringView thread_name = nullptr);
-    Function<int()> m_action;
+    explicit Thread(Function<intptr_t()> action, StringView thread_name = nullptr);
+    Function<intptr_t()> m_action;
     pthread_t m_tid { 0 };
     String m_thread_name;
 };