diff --git a/include/stratosphere/mitm/mitm_query_service.hpp b/include/stratosphere/mitm/mitm_query_service.hpp
index a007cdc8..621c4cfb 100644
--- a/include/stratosphere/mitm/mitm_query_service.hpp
+++ b/include/stratosphere/mitm/mitm_query_service.hpp
@@ -44,7 +44,7 @@ class MitmQueryService : public IServiceObject {
         }
     public:
         DEFINE_SERVICE_DISPATCH_TABLE {
-            MakeServiceCommandMeta<MQS_Cmd_ShouldMitm, &MitmQueryService::ShouldMitm>(),
-            MakeServiceCommandMeta<MQS_Cmd_AssociatePidTid, &MitmQueryService::AssociatePidToTid>(),
+            MakeServiceCommandMeta<MQS_Cmd_ShouldMitm, &MitmQueryService<T>::ShouldMitm>(),
+            MakeServiceCommandMeta<MQS_Cmd_AssociatePidTid, &MitmQueryService<T>::AssociatePidToTid>(),
         };
 };
\ No newline at end of file
diff --git a/include/stratosphere/mitm/mitm_server.hpp b/include/stratosphere/mitm/mitm_server.hpp
index 5380fae2..dc7dbac6 100644
--- a/include/stratosphere/mitm/mitm_server.hpp
+++ b/include/stratosphere/mitm/mitm_server.hpp
@@ -93,8 +93,8 @@ template<typename T>
 static void AddMitmServerToManager(SessionManagerBase *manager, const char *srv_name, unsigned int max_sessions) {
     Handle query_h;
     auto *srv = new MitmServer<T>(&query_h, srv_name, max_sessions);
-    manager->AddWaitable(srv);
     manager->AddSession(query_h, std::move(ServiceObjectHolder(std::move(std::make_shared<MitmQueryService<T>>()))));
+    manager->AddWaitable(srv);
 }