diff --git a/configure.py b/configure.py
index 030f185b..a76bfba2 100644
--- a/configure.py
+++ b/configure.py
@@ -637,8 +637,8 @@ config.libs = [
             Object(Matching, "JSystem/JKernel/JKRAramHeap.cpp"),
             Object(Matching, "JSystem/JKernel/JKRAramPiece.cpp"),
             Object(Matching, "JSystem/JKernel/JKRAramStream.cpp"),
-            Object(NonMatching, "JSystem/JKernel/JKRArchivePri.cpp"),
-            Object(NonMatching, "JSystem/JKernel/JKRArchivePub.cpp"),
+            Object(Matching, "JSystem/JKernel/JKRArchivePri.cpp"),
+            Object(Matching, "JSystem/JKernel/JKRArchivePub.cpp"),
             Object(Matching, "JSystem/JKernel/JKRCompArchive.cpp"),
             Object(Matching, "JSystem/JKernel/JKRDecomp.cpp"),
             Object(Matching, "JSystem/JKernel/JKRDisposer.cpp"),
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h
index 6b8e685e..752078f7 100644
--- a/include/JSystem/JKernel/JKRArchive.h
+++ b/include/JSystem/JKernel/JKRArchive.h
@@ -127,10 +127,7 @@ public:
         u32 _1C;              // _1C
     };
 
-    JKRArchive(s32, EMountMode);
-private:
-    ~JKRArchive();
-public:                                                                                                                 // _08
+public:
     virtual bool becomeCurrent(const char*);                                                                                                // _10
     virtual void* getResource(const char* path);                                                                                            // _14
     virtual void* getResource(u32 type, const char* name);                                                                                  // _18
@@ -145,6 +142,11 @@ public:
     virtual void* fetchResource(SDIFileEntry* entry, u32* outSize) = 0;                                                                     // _40
     virtual void* fetchResource(void* resourceBuffer, u32 bufferSize, SDIFileEntry* entry, u32* resSize, JKRExpandSwitch expandSwitch) = 0; // _44
 
+    JKRArchive(s32, EMountMode);
+    JKRArchive();
+    JKRArchive(const char* p1, EMountMode mountMode);
+    ~JKRArchive();
+    
     SDIDirEntry* findDirectory(const char*, u32) const;
     SDIFileEntry* findFsResource(const char*, u32) const;
     SDIFileEntry* findIdResource(u16) const;
@@ -165,8 +167,6 @@ public:
     static JKRArchive* check_mount_already(s32);
     static JKRArchive* check_mount_already(s32, JKRHeap*);
 
-    JKRArchive();
-    JKRArchive(const char* p1, EMountMode mountMode);
     SDIDirEntry* findResType(u32) const;
     SDIFileEntry* findTypeResource(u32, u32) const;
 
diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h
index 93229ee2..14514ea4 100644
--- a/include/JSystem/JUtility/JUTException.h
+++ b/include/JSystem/JUtility/JUTException.h
@@ -19,7 +19,7 @@ enum ExPrintFlags
     EXPRINTFLAG_GPRMap = 0x2,
     EXPRINTFLAG_Float = 0x4,
     EXPRINTFLAG_Stack = 0x8,
-    EXPRINTFLAG_All = 0xF,
+    EXPRINTFLAG_All = 0xFF,
 };
 
 /**
diff --git a/include/libc/ctype.h b/include/libc/ctype.h
index 9731e067..e9689a2f 100644
--- a/include/libc/ctype.h
+++ b/include/libc/ctype.h
@@ -1,6 +1,14 @@
 #ifndef _DOLPHIN_LIBC_CTYPE_H_
 #define _DOLPHIN_LIBC_CTYPE_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int tolower(int c);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // _DOLPHIN_LIBC_CTYPE_H_
diff --git a/src/static/JSystem/JUtility/JUTException.cpp b/src/static/JSystem/JUtility/JUTException.cpp
index a03ea119..c3b04d85 100644
--- a/src/static/JSystem/JUtility/JUTException.cpp
+++ b/src/static/JSystem/JUtility/JUTException.cpp
@@ -111,7 +111,7 @@ JUTException::JUTException(JUTDirectPrint *directPrint) : JKRThread(0x4000, 0x10
     mPrintWaitTime1 = 10;
     mTraceSuppress = 0xffffffff;
     _98 = 0;
-    mPrintFlags = 0xff;
+    mPrintFlags = EXPRINTFLAG_All;
 }
 
 void JUTException::errorHandler(OSError error, OSContext *context, u32 dsisr, u32 dar)