diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp
index b4ce5903..9aa3d5f3 100644
--- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp
@@ -45,7 +45,7 @@ volatile CustomizeTable C = {
 
 .marikoCpuMaxVolt = 1185,
 
-.marikoEmcMaxClock = 2133000, // Hynix NME and Samsung AM-MGCJ Rating (others are 4766MT, 2133MHz)
+.marikoEmcMaxClock = 3000000, // Hynix NME and Samsung AM-MGCJ Rating (others are 4766MT, 2133MHz)
 
 .marikoEmcVddqVolt = 640000,
 
@@ -114,7 +114,7 @@ volatile CustomizeTable C = {
     710  /* 1075 */,
     735  /* 1152 */,
     785  /* 1228 */,
-    785    /* 1267  (Disabled by default) */,
+    800    /* 1267  (Disabled by default) */,
     780    /* 1305  (Disabled by default) */,
     960    /* 1344  (Disabled by default) */,
     960    /* 1382  (Disabled by default) */,
diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.cpp
index 49408106..fbe62621 100644
--- a/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.cpp
@@ -100,11 +100,6 @@ namespace ams::ldr::oc::pcv::mariko {
         }
     }
 
-    void CalculateTW2RDerivedWriteTimings() {
-        tWTM = WL + (BL / 2) + 1 + CEIL(tW2R / tCK_avg);
-        tWATM = tWTM + CEIL(tWR / tCK_avg);
-    }
-
     void CalculateQuse() {
         quse = ROUND(0.002266 * (C.marikoEmcMaxClock / 1000.0) + 31.88) + C.mem_burst_read_latency;
 
@@ -173,7 +168,6 @@ namespace ams::ldr::oc::pcv::mariko {
         CalculateTWTPDEN();
         CalculateTR2W();
         CalculateTW2R();
-        CalculateTW2RDerivedWriteTimings();
         CalculateQuse();
         CalculateQrst();
         CalculateQsafe();
diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/mtc_timing_value.hpp b/Source/Atmosphere/stratosphere/loader/source/oc/mtc_timing_value.hpp
index c26fad11..54c618a7 100644
--- a/Source/Atmosphere/stratosphere/loader/source/oc/mtc_timing_value.hpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/mtc_timing_value.hpp
@@ -145,8 +145,8 @@ namespace ams::ldr::oc {
         inline u32 tW2P;
         inline u32 tWTPDEN;
         inline u32 tW2R;
-        inline u32 tWTM;
-        inline u32 tWATM;
+        const u32 tWTM = WL + (BL / 2) + 1 + CEIL(7.5 / tCK_avg);
+        const u32 tWATM = tWTM + CEIL(tWR / tCK_avg);
 
         const u32 wdv = 0xE + C.mem_burst_write_latency;
         const u32 wsv = 0xC + C.mem_burst_write_latency;