diff --git a/app/src/main/cpp/core/hos/kernel/svc.cpp b/app/src/main/cpp/core/hos/kernel/svc.cpp
index a317a47a..2f7e088a 100644
--- a/app/src/main/cpp/core/hos/kernel/svc.cpp
+++ b/app/src/main/cpp/core/hos/kernel/svc.cpp
@@ -21,11 +21,14 @@ namespace core::kernel {
     {
         switch (GetRegister(UC_ARM64_REG_X1))
         {
-            case 12:
+            case 12: // AddressSpaceBaseAddr
                 SetRegister(UC_ARM64_REG_X1, BASE_ADDRESS);
                 break;
+            case 18: // TitleId
+                SetRegister(UC_ARM64_REG_X1, 0); // TODO: Add this
+                break;
             default:
-                syslog(LOG_ERR, "Unimplemented GetInfo id id1=%i,id2=%i", GetRegister(UC_ARM64_REG_X1), GetRegister(UC_ARM64_REG_X3));
+                syslog(LOG_ERR, "Unimplemented GetInfo ID! ID1 = %i, ID2 = %i", GetRegister(UC_ARM64_REG_X1), GetRegister(UC_ARM64_REG_X3));
                 return 0x177202;
         }
 
diff --git a/app/src/main/cpp/lightswitch.cpp b/app/src/main/cpp/lightswitch.cpp
index 755e927a..2818e935 100644
--- a/app/src/main/cpp/lightswitch.cpp
+++ b/app/src/main/cpp/lightswitch.cpp
@@ -11,7 +11,7 @@ Java_gq_cyuubi_lightswitch_MainActivity_stringFromJNI(
         jobject /* this */) {
 
     core::cpu::Initialize();
-    core::loader::LoadNro("/sdcard/test.nro");
+    core::loader::LoadNro("/sdcard/lawsofaviation.nro");
     core::cpu::Run(BASE_ADDRESS);
 
     std::string finished = "finished!";