3 files changed, 8 insertions, 18 deletions
diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp
index 42d1fcc28..36d0d20d2 100644
--- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp
+++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp
@@ -35,11 +35,11 @@ namespace {
 using namespace Common::Literals;
 
 u32 GetMemorySizeForInit() {
-    return Settings::values.use_extended_memory_layout ? Smc::MemorySize_6GB : Smc::MemorySize_4GB;
+    return Settings::values.use_extended_memory_layout ? Smc::MemorySize_8GB : Smc::MemorySize_4GB;
 }
 
 Smc::MemoryArrangement GetMemoryArrangeForInit() {
-    return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_6GB
+    return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_8GB
                                                        : Smc::MemoryArrangement_4GB;
 }
 } // namespace
@@ -91,7 +91,8 @@ std::size_t KSystemControl::Init::GetApplicationPoolSize() {
         case Smc::MemoryArrangement_6GBForAppletDev:
             return 3285_MiB;
         case Smc::MemoryArrangement_8GB:
-            return 4916_MiB;
+            // Real kernel sets this to 4916_MiB. We are not debugging applets.
+            return 6547_MiB;
         }
     }();
 
@@ -115,7 +116,8 @@ size_t KSystemControl::Init::GetAppletPoolSize() {
         case Smc::MemoryArrangement_6GBForAppletDev:
             return 2193_MiB;
         case Smc::MemoryArrangement_8GB:
-            return 2193_MiB;
+            //! Real kernel sets this to 2193_MiB. We are not debugging applets.
+            return 562_MiB;
         }
     }();
 
diff --git a/src/core/internal_network/socket_proxy.h b/src/core/internal_network/socket_proxy.h
index 9421492bc..6e991fa38 100644
--- a/src/core/internal_network/socket_proxy.h
+++ b/src/core/internal_network/socket_proxy.h
@@ -16,9 +16,6 @@ namespace Network {
 
 class ProxySocket : public SocketBase {
 public:
-    YUZU_NON_COPYABLE(ProxySocket);
-    YUZU_NON_MOVEABLE(ProxySocket);
-
     explicit ProxySocket(RoomNetwork& room_network_) noexcept;
     ~ProxySocket() override;
 
diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h
index 4c7489258..11e479e50 100644
--- a/src/core/internal_network/sockets.h
+++ b/src/core/internal_network/sockets.h
@@ -36,13 +36,10 @@ public:
 
     SocketBase() = default;
     explicit SocketBase(SOCKET fd_) : fd{fd_} {}
-
     virtual ~SocketBase() = default;
 
-    virtual SocketBase& operator=(const SocketBase&) = delete;
-
-    // Avoid closing sockets implicitly
-    virtual SocketBase& operator=(SocketBase&&) noexcept = delete;
+    YUZU_NON_COPYABLE(SocketBase);
+    YUZU_NON_MOVEABLE(SocketBase);
 
     virtual Errno Initialize(Domain domain, Type type, Protocol protocol) = 0;
 
@@ -109,14 +106,8 @@ public:
 
     ~Socket() override;
 
-    Socket(const Socket&) = delete;
-    Socket& operator=(const Socket&) = delete;
-
     Socket(Socket&& rhs) noexcept;
 
-    // Avoid closing sockets implicitly
-    Socket& operator=(Socket&&) noexcept = delete;
-
     Errno Initialize(Domain domain, Type type, Protocol protocol) override;
 
     Errno Close() override;