diff --git a/libraries/libmesosphere/source/board/nintendo/nx/kern_k_device_page_table.cpp b/libraries/libmesosphere/source/board/nintendo/nx/kern_k_device_page_table.cpp
index f70bcbb97..292c25750 100644
--- a/libraries/libmesosphere/source/board/nintendo/nx/kern_k_device_page_table.cpp
+++ b/libraries/libmesosphere/source/board/nintendo/nx/kern_k_device_page_table.cpp
@@ -1214,7 +1214,7 @@ namespace ams::kern::board::nintendo::nx {
                     for (size_t i = 0; i < map_count; ++i) {
                         /* Get the physical address. */
                         const KPhysicalAddress phys_addr = l2[l2_index + i].GetPhysicalAddress();
-                        MESOSPHERE_ASSERT(IsHeapPhysicalAddress(phys_addr));
+                        MESOSPHERE_ASSERT(phys_addr == Null<KPhysicalAddress> || IsHeapPhysicalAddress(phys_addr));
 
                         /* Fully invalidate the entry. */
                         l2[l2_index + i].Invalidate();
diff --git a/libraries/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp b/libraries/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp
index cd20d43a7..d51eb90e8 100644
--- a/libraries/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp
+++ b/libraries/libstratosphere/include/stratosphere/ams/impl/ams_system_thread_definitions.hpp
@@ -95,7 +95,7 @@ namespace ams::impl {
     AMS_DEFINE_SYSTEM_THREAD(16, creport, Main);
 
     /* ro. */
-    AMS_DEFINE_SYSTEM_THREAD(16, ro, Main);
+    AMS_DEFINE_SYSTEM_THREAD(21, ro, Main);
 
     /* gpio. */
     AMS_DEFINE_SYSTEM_THREAD(-12, gpio, InterruptHandler);
diff --git a/libraries/libstratosphere/include/stratosphere/ddsf/ddsf_i_session.hpp b/libraries/libstratosphere/include/stratosphere/ddsf/ddsf_i_session.hpp
index 146b17dd5..a103aae83 100644
--- a/libraries/libstratosphere/include/stratosphere/ddsf/ddsf_i_session.hpp
+++ b/libraries/libstratosphere/include/stratosphere/ddsf/ddsf_i_session.hpp
@@ -50,7 +50,7 @@ namespace ams::ddsf {
             }
 
             void DetachDevice() {
-                AMS_ASSERT(this->IsOpen());
+                /* AMS_ASSERT(this->IsOpen()); */
                 m_device      = nullptr;
                 m_access_mode = AccessMode_None;
                 AMS_ASSERT(!this->IsOpen());
diff --git a/libraries/libstratosphere/source/diag/diag_log_impl.hpp b/libraries/libstratosphere/source/diag/diag_log_impl.hpp
index 05b625307..4a504375f 100644
--- a/libraries/libstratosphere/source/diag/diag_log_impl.hpp
+++ b/libraries/libstratosphere/source/diag/diag_log_impl.hpp
@@ -20,7 +20,7 @@ namespace ams::diag {
 
     namespace impl {
 
-        constexpr inline size_t DebugPrintBufferLength = 0x80;
+        constexpr inline size_t DebugPrintBufferLength = 0x100;
 
     }
 
diff --git a/libraries/libstratosphere/source/powctl/powctl_battery_api.cpp b/libraries/libstratosphere/source/powctl/powctl_battery_api.cpp
index 09ec1a8a5..539ceb04f 100644
--- a/libraries/libstratosphere/source/powctl/powctl_battery_api.cpp
+++ b/libraries/libstratosphere/source/powctl/powctl_battery_api.cpp
@@ -22,7 +22,7 @@ namespace ams::powctl {
     namespace {
 
         impl::SessionImpl &GetOpenSessionImpl(Session &session) {
-            AMS_ASSERT(session.has_session);
+            /* AMS_ASSERT(session.has_session); */
             auto &impl = GetReference(session.impl_storage);
             AMS_ASSERT(impl.IsOpen());
             return impl;
diff --git a/libraries/libstratosphere/source/powctl/powctl_charger_api.cpp b/libraries/libstratosphere/source/powctl/powctl_charger_api.cpp
index 51f3b6409..b408bf845 100644
--- a/libraries/libstratosphere/source/powctl/powctl_charger_api.cpp
+++ b/libraries/libstratosphere/source/powctl/powctl_charger_api.cpp
@@ -22,7 +22,7 @@ namespace ams::powctl {
     namespace {
 
         impl::SessionImpl &GetOpenSessionImpl(Session &session) {
-            AMS_ASSERT(session.has_session);
+            /* AMS_ASSERT(session.has_session); */
             auto &impl = GetReference(session.impl_storage);
             AMS_ASSERT(impl.IsOpen());
             return impl;
diff --git a/libraries/libvapours/include/vapours/allocator.hpp b/libraries/libvapours/include/vapours/allocator.hpp
index b5d294bfe..3828d4a05 100644
--- a/libraries/libvapours/include/vapours/allocator.hpp
+++ b/libraries/libvapours/include/vapours/allocator.hpp
@@ -19,7 +19,7 @@
 
 namespace ams {
 
-    constexpr inline size_t DefaultAlignment = alignof(max_align_t);
+    constexpr inline size_t DefaultAlignment = /*alignof(max_align_t)*/ 0x8;
 
     using AllocateFunction                    = void *(*)(size_t);
     using AllocateFunctionWithUserData        = void *(*)(size_t, void *);