diff --git a/Makefile b/Makefile
index c62a6a63..5bde8668 100755
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,7 @@ ifeq ($(shell getconf LONG_BIT), 64)
   # Ensure that gcc treats the code as 32-bit
   CC_CHECK_CFLAGS += -m32
 endif
-CC_CHECK_CFLAGS := -fsyntax-only -fsigned-char $(INCLUDE_CFLAGS) $(DEF_INC_CFLAGS) -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-main -DNON_MATCHING -DAVOID_UB -D_LANGUAGE_C -DNDEBUG -Werror-implicit-function-declaration
+CC_CHECK_CFLAGS := -fsyntax-only -funsigned-char $(INCLUDE_CFLAGS) $(DEF_INC_CFLAGS) -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-main -DNON_MATCHING -DAVOID_UB -D_LANGUAGE_C -DNDEBUG -Werror-implicit-function-declaration
 
 #Warnings to ignore
 CC_CHECK_CFLAGS += -Wno-builtin-declaration-mismatch -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
diff --git a/src/printf.c b/src/printf.c
index 128c3686..14a27b42 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -298,7 +298,7 @@ UNUSED s32 func_800B63F4(const char *format, ...) {
     s32 fontCharU;
     s32 stringLength;
     char s[255];
-    char *ch;
+    u8 *ch;
     va_list args;
     va_start(args, format);
 
@@ -306,7 +306,7 @@ UNUSED s32 func_800B63F4(const char *format, ...) {
     func_800B4A08(1);
     vsprintf(s, format, args);
     func_800B4A08(0);
-    for (ch = &s[0]; *ch != '\0'; ch++) {
+    for (ch = (u8 *) &s[0]; *ch != '\0'; ch++) {
         pad = *ch;
         if (*ch != (0, '\n')) {
             if (pad == ' ') {
diff --git a/src/thread0_epc.c b/src/thread0_epc.c
index d98e4fbf..c8262191 100644
--- a/src/thread0_epc.c
+++ b/src/thread0_epc.c
@@ -36,10 +36,10 @@ s32 sLockupDelay = 0;
 
 u64 gEPCStack[0x200];
 OSThread gEPCThread;
-s32 D_80129790[6]; // Osmesg stuff
-s32 D_801297A8[8];
-s32 D_801297C8[8];
-s32 D_801297E8[6];
+OSMesgQueue D_80129790;
+OSMesg D_801297A8[8];
+OSMesg D_801297C8[8];
+OSMesgQueue D_801297E8;
 
 /**
  * Start the exception program counter thread.
@@ -60,13 +60,13 @@ void thread0_Main(UNUSED void *unused) {
     s32 sp34;
     s32 s0 = 0;
 
-    osCreateMesgQueue(&D_80129790, &D_801297A8, 8);
-    osSetEventMesg(OS_EVENT_FAULT, &D_80129790, 8);
-    osSetEventMesg(OS_EVENT_CPU_BREAK, &D_80129790, 2);
-    osCreatePiManager(150, &D_801297E8, &D_801297C8, 8);
+    osCreateMesgQueue(&D_80129790, D_801297A8, 8);
+    osSetEventMesg(OS_EVENT_FAULT, &D_80129790, (OSMesg) 8);
+    osSetEventMesg(OS_EVENT_CPU_BREAK, &D_80129790, (OSMesg) 2);
+    osCreatePiManager(150, &D_801297E8, D_801297C8, 8);
 
     while (1) {
-        osRecvMesg(&D_80129790, &sp34, OS_MESG_BLOCK);
+        osRecvMesg(&D_80129790, (OSMesg) &sp34, OS_MESG_BLOCK);
         if (!(get_filtered_cheats() & CHEAT_EPC_LOCK_UP_DISPLAY)) {
             continue;
         }