diff --git a/source/sys.c b/source/sys.c
index 42b40fd..524cf7a 100644
--- a/source/sys.c
+++ b/source/sys.c
@@ -243,7 +243,7 @@ s32 Sys_GetSharedContents(SharedContent** out, u32* count)
 
 	int ret = 0;
 	u32 size;
-	SharedContent* buf = NANDLoadFile("/shared1/content.map", &size);
+	SharedContent* buf = (SharedContent*)NANDLoadFile("/shared1/content.map", &size);
 
 	if (!buf)
 		return (s32)size;
diff --git a/source/title.c b/source/title.c
index 44d67de..2f01539 100644
--- a/source/title.c
+++ b/source/title.c
@@ -6,6 +6,7 @@
 #include <ogc/es.h>
 
 #include "sha1.h"
+#include "aes.h"
 #include "utils.h"
 #include "otp.h"
 #include "malloc.h"
@@ -341,4 +342,4 @@ void Title_SetupCommonKeys(void)
 
 	keys_ok = true;
 	return;
-};
\ No newline at end of file
+};
diff --git a/source/wad-manager.c b/source/wad-manager.c
index 28fb32c..7fbb1fc 100644
--- a/source/wad-manager.c
+++ b/source/wad-manager.c
@@ -183,6 +183,8 @@ int main(int argc, char **argv)
 	WKB_Initialize();
 	WIILIGHT_Init();
 
+	Title_SetupCommonKeys();
+
 	/* Print disclaimer */
 	//Disclaimer();
 	
diff --git a/source/wad.c b/source/wad.c
index 822295e..3282051 100644
--- a/source/wad.c
+++ b/source/wad.c
@@ -571,7 +571,6 @@ bool __Wad_FixTicket(signed_blob *s_tik)
 		{
 			__attribute__ ((aligned(0x10)))
 			aeskey tkeybuf;
-			aeskey commonkey;
 			u64 iv[2];
 
 			memcpy(tkeybuf, p_tik->cipher_title_key, sizeof(aeskey));