diff --git a/overlay/source/main.cpp b/overlay/source/main.cpp
index 984372f..2ff656c 100644
--- a/overlay/source/main.cpp
+++ b/overlay/source/main.cpp
@@ -14,7 +14,7 @@ class OverlayTest : public tsl::Overlay {
     virtual void initServices() override {
         Result rc = tuneInitialize();
 
-        if (rc == MAKERESULT(Module_Libnx, LibnxError_NotFound)) {
+        if (R_VALUE(rc) == MAKERESULT(Module_Libnx, LibnxError_NotFound)) {
             u64 pid = 0;
             const NcmProgramLocation programLocation{
                 .program_id = 0x4200000000000000,
@@ -33,9 +33,11 @@ class OverlayTest : public tsl::Overlay {
             svcSleepThread(100'000'000);
             rc = tuneInitialize();
         }
+
         if (R_FAILED(rc)) {
             this->msg  = "Something went wrong:";
             this->fail = rc;
+            return;
         }
 
         u32 api;
diff --git a/sys-tune/source/main.cpp b/sys-tune/source/main.cpp
index d68d63c..a9d71c5 100644
--- a/sys-tune/source/main.cpp
+++ b/sys-tune/source/main.cpp
@@ -8,7 +8,7 @@ extern "C" {
 u32 __nx_applet_type     = AppletType_None;
 u32 __nx_fs_num_sessions = 1;
 
-#define INNER_HEAP_SIZE 0x50000
+#define INNER_HEAP_SIZE 0x60000
 size_t nx_inner_heap_size = INNER_HEAP_SIZE;
 char nx_inner_heap[INNER_HEAP_SIZE];
 
diff --git a/sys-tune/sys-tune.json b/sys-tune/sys-tune.json
index 72e7594..3a9a62b 100644
--- a/sys-tune/sys-tune.json
+++ b/sys-tune/sys-tune.json
@@ -3,7 +3,7 @@
     "title_id":    "0x4200000000000000",
     "title_id_range_min":    "0x4200000000000000",
     "title_id_range_max":    "0x4200000000000000",
-    "main_thread_stack_size":    "0x00002000",
+    "main_thread_stack_size":    "0x00001000",
     "main_thread_priority":    48,
     "default_cpu_id":    3,
     "process_category":    0,