diff --git a/Makefile.wiiu b/Makefile.wiiu
index 48bd065b1d..a29b98c070 100644
--- a/Makefile.wiiu
+++ b/Makefile.wiiu
@@ -12,6 +12,7 @@ OBJ	+= wiiu/dynamic_libs/fs_functions.o
 OBJ	+= wiiu/dynamic_libs/padscore_functions.o
 OBJ	+= wiiu/dynamic_libs/vpad_functions.o
 OBJ	+= wiiu/system/memory.o
+OBJ	+= wiiu/system/exception_handler.o
 OBJ	+= wiiu/dynamic_libs/gx2_functions.o
 OBJ	+= wiiu/dynamic_libs/socket_functions.o
 OBJ	+= wiiu/fs/fs_utils.o
@@ -100,13 +101,13 @@ LIBDIRS := -L.
 
 CFLAGS  := -mrvl -mcpu=750 -meabi -mhard-float
 LDFLAGS :=
-#LDFLAGS := $(CFLAGS)
 
 ifeq ($(DEBUG), 1)
    CFLAGS	+= -O0 -g
 else
    CFLAGS	+= -O3
 endif
+LDFLAGS := $(CFLAGS)
 
 ASFLAGS := $(CFLAGS) -mregnames
 
diff --git a/frontend/drivers/platform_wiiu.c b/frontend/drivers/platform_wiiu.c
index 1c3fbd2b79..3676910879 100644
--- a/frontend/drivers/platform_wiiu.c
+++ b/frontend/drivers/platform_wiiu.c
@@ -43,10 +43,14 @@
 #include "dynamic_libs/vpad_functions.h"
 #include "dynamic_libs/padscore_functions.h"
 #include "dynamic_libs/socket_functions.h"
+//#include "dynamic_libs/curl_functions.h"
 #include "dynamic_libs/ax_functions.h"
+//#include "dynamic_libs/aoc_functions.h"
+//#include "dynamic_libs/acp_functions.h"
 #include "fs/fs_utils.h"
 #include "fs/sd_fat_devoptab.h"
 #include "system/memory.h"
+#include "system/exception_handler.h"
 #include "utils/logger.h"
 #include "utils/utils.h"
 #include "common/common.h"
@@ -257,13 +261,23 @@ int __entry_menu(int argc, char **argv)
    InitSocketFunctionPointers();
 
    log_init("10.42.0.1");
-
    devoptab_list[STD_OUT] = &dotab_stdout;
    devoptab_list[STD_ERR] = &dotab_stdout;
+
    InitFSFunctionPointers();
+   InitGX2FunctionPointers();
+   InitSysFunctionPointers();
    InitVPadFunctionPointers();
+   InitPadScoreFunctionPointers();
+   InitAXFunctionPointers();
+//   InitCurlFunctionPointers();
+//   InitAocFunctionPointers();
+//   InitACPFunctionPointers();
+
+
    memoryInitialize();
    mount_sd_fat("sd");
+   setup_os_exceptions();
    VPADInit();
    OSScreenInit();
 
diff --git a/wiiu/fs/fs_utils.c b/wiiu/fs/fs_utils.c
index efa2e556b3..20af6dd1fd 100644
--- a/wiiu/fs/fs_utils.c
+++ b/wiiu/fs/fs_utils.c
@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "common/fs_defs.h"
 #include "dynamic_libs/fs_functions.h"
 
 
diff --git a/wiiu/system/exception_handler.c b/wiiu/system/exception_handler.c
index b64224871f..0443693b64 100644
--- a/wiiu/system/exception_handler.c
+++ b/wiiu/system/exception_handler.c
@@ -147,7 +147,7 @@ static unsigned char exception_cb(void * c, unsigned char exception_type) {
 		for (i = 0; i < 8; i += 4)
             pos += sprintf(buf + pos, exception_print_formats[17], &(pAdd[i]),pAdd[i], pAdd[i+1], pAdd[i+2], pAdd[i+3]);
 	//}
-    log_print(buf);
+    printf(buf);
     OSFatal(buf);
     return 1;
 }