diff --git a/config/RSPE01_01/symbols.txt b/config/RSPE01_01/symbols.txt
index 848b5944..161bf70a 100644
--- a/config/RSPE01_01/symbols.txt
+++ b/config/RSPE01_01/symbols.txt
@@ -6854,7 +6854,7 @@ systemShutDown__11RPSysSystemFv = .text:0x801831F0; // type:function size:0xD8
 fn_801832C8 = .text:0x801832C8; // type:function size:0x28
 fn_801832F0 = .text:0x801832F0; // type:function size:0x18
 startLoadCount__11RPSysSystemFv = .text:0x80183308; // type:function size:0xC
-fn_80183314 = .text:0x80183314; // type:function size:0xA0
+getCalendarTime__11RPSysSystemFPCUsRUlRUlRUl = .text:0x80183314; // type:function size:0xA0
 fn_801833B4 = .text:0x801833B4; // type:function size:0xBC
 getCalendarTime16__11RPSysSystemFv = .text:0x80183470; // type:function size:0x4C
 getCalendarTime32__11RPSysSystemFv = .text:0x801834BC; // type:function size:0x5C
diff --git a/configure.py b/configure.py
index 40cbea48..39f0e511 100755
--- a/configure.py
+++ b/configure.py
@@ -1208,7 +1208,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "Pack/RPKernel/RPSysAppMiiManager.cpp"),
             Object(Matching, "Pack/RPKernel/RPSysPairingMgr.cpp"),
             Object(NonMatching, "Pack/RPKernel/RPSysControllerMgr.cpp"),
-            Object(NonMatching, "Pack/RPKernel/RPSysNWC24Manager.cpp"),
+            Object(Matching, "Pack/RPKernel/RPSysNWC24Manager.cpp"),
             Object(NonMatching, "Pack/RPKernel/RPSysParticleManager.cpp"),
         ],
     },
diff --git a/include/Pack/RPKernel/RPSysNWC24Manager.h b/include/Pack/RPKernel/RPSysNWC24Manager.h
index 1c6abc56..8f991702 100644
--- a/include/Pack/RPKernel/RPSysNWC24Manager.h
+++ b/include/Pack/RPKernel/RPSysNWC24Manager.h
@@ -31,7 +31,7 @@ class RPSysNWC24Manager {
      *
      * @param pHeap Heap to use for allocations
      */
-    RPSysNWC24Manager(EGG::Heap* pHeap);
+    explicit RPSysNWC24Manager(EGG::Heap* pHeap);
 
     /**
      * @brief Destructor
diff --git a/src/Pack/RPKernel/RPSysNWC24Manager.cpp b/src/Pack/RPKernel/RPSysNWC24Manager.cpp
index 8e97185d..741c8235 100644
--- a/src/Pack/RPKernel/RPSysNWC24Manager.cpp
+++ b/src/Pack/RPKernel/RPSysNWC24Manager.cpp
@@ -59,7 +59,6 @@ RPSysNWC24Manager::~RPSysNWC24Manager() {}
 /**
  * @brief Attempts to commit a message to the Wii Message Board
  *
- * @param pWork Library work buffer
  * @param pAltName Mail letter alt name
  * @param pMsg Mail letter message (can be a format string)
  * @param date Mail letter send date
@@ -219,21 +218,24 @@ bool RPSysNWC24Manager::commitMail(const wchar_t* pAltName, const wchar_t* pMsg,
 /**
  * @brief Attempts to open the WiiConnect24 library for use
  *
- * @return Success
+ * @return True if the library is opened, false if not
  */
 bool RPSysNWC24Manager::openLib() {
     NWC24Work* pNwc24Work = reinterpret_cast<NWC24Work*>(mpNwc24Work);
+    bool finished;
 
     switch (NWC24OpenLib(pNwc24Work)) {
     case NWC24_ERR_LIB_OPENED:
     case NWC24_OK: {
-        return true;
+        finished = true;
+        break;
     }
 
     case NWC24_ERR_INPROGRESS:
     case NWC24_ERR_BUSY:
     case NWC24_ERR_MUTEX: {
-        return false;
+        finished = false;
+        break;
     }
 
     case NWC24_ERR_NAND_CORRUPT:
@@ -245,14 +247,18 @@ bool RPSysNWC24Manager::openLib() {
     case NWC24_ERR_FILE_OPEN:
     case NWC24_ERR_BROKEN:
     case NWC24_ERR_FATAL: {
+        finished = false;
         sSuccess = false;
-        return false;
+        break;
     }
 
     default: {
-        return false;
+        finished = false;
+        break;
     }
     }
+
+    return finished;
 }
 
 /**