diff --git a/libmesosphere/include/mesosphere/init/kern_init_layout.hpp b/libmesosphere/include/mesosphere/init/kern_init_layout.hpp
index 904defc4..620ef85f 100644
--- a/libmesosphere/include/mesosphere/init/kern_init_layout.hpp
+++ b/libmesosphere/include/mesosphere/init/kern_init_layout.hpp
@@ -27,7 +27,7 @@ namespace ams::kern::init {
         u32 rw_end_offset;
         u32 bss_offset;
         u32 bss_end_offset;
-        u32 ini_end_offset;
+        u32 ini_load_offset;
         u32 dynamic_offset;
         u32 init_array_offset;
         u32 init_array_end_offset;
diff --git a/libmesosphere/source/svc/kern_svc_tables.cpp b/libmesosphere/source/arch/arm64/svc/kern_svc_tables.cpp
similarity index 96%
rename from libmesosphere/source/svc/kern_svc_tables.cpp
rename to libmesosphere/source/arch/arm64/svc/kern_svc_tables.cpp
index a2fd6a28..bc5b264f 100644
--- a/libmesosphere/source/svc/kern_svc_tables.cpp
+++ b/libmesosphere/source/arch/arm64/svc/kern_svc_tables.cpp
@@ -16,6 +16,8 @@
 #include <mesosphere.hpp>
 #include <vapours/svc/svc_codegen.hpp>
 
+/* TODO: Enable compilation of this file when the kernel supports supervisor calls. */
+#if 0
 namespace ams::kern::svc {
 
     namespace {
@@ -41,7 +43,6 @@ namespace ams::kern::svc {
 
     }
 
-    /* TODO: 32-bit ABI */
     const std::array<SvcTableEntry, NumSupervisorCalls> SvcTable64From32 = [] {
         std::array<SvcTableEntry, NumSupervisorCalls> table = {};
 
@@ -65,3 +66,4 @@ namespace ams::kern::svc {
     }();
 
 }
+#endif
\ No newline at end of file