diff --git a/include/common.h b/include/common.h
index c172990..fb99e6b 100644
--- a/include/common.h
+++ b/include/common.h
@@ -170,7 +170,6 @@ extern void (*SWAP_BUFFER_FUNC_800A9E8C)(void** buffers);
 extern void (*D_800AA090)(s32);
 extern void (*D_800AA094)();
 extern s32 D_800E79A4;
-extern OSMesg OSMESG_800BE1A0[8];
 extern u8 SP_THREAD_800BE1C0[1];
 extern OSThread THREAD_800BE1C0;
 extern void* D_800AA41C;
diff --git a/include/nu/nusys.h b/include/nu/nusys.h
index 43b0202..95d43c0 100644
--- a/include/nu/nusys.h
+++ b/include/nu/nusys.h
@@ -663,6 +663,7 @@ extern u8	nuDramStack[];
 extern u8	nuYieldBuf[];
 extern NUSched	nusched;		/* Scheduler structure */
 extern OSMesgQueue nuGfxMesgQ;	/* Graphics thread queue */
+extern OSMesg nuGfxMesgBuf[NU_GFX_MESGS];
 extern u32	nuScRetraceCounter;    /* Retrace counter */
 extern u8	nuScPreNMIFlag;
 /*--------------------------------------*/
@@ -676,7 +677,6 @@ extern u16*		nuGfxZBuffer;	/* Pointer to the Z buffer */
 extern volatile u32	nuGfxTaskSpool; /* Number of tasks in queue */
 extern u32		nuGfxDisplay;	/* Display on/off flag  */
 extern u32		nuGfxCfbCounter; /* For frame buffer swapping */
-//extern OSMesgQueue	nuGfxMesgQ;
 extern OSThread		nuGfxThread;			/* graphic thread */
 
 /*--------------------------------------*/
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index 5fb74e8..b72262b 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -7,6 +7,7 @@ nuGfxCfbNum = 0x800A9E80;
 nuGfxCfbCounter = 0x800C4BC4;
 nuGfxCfb_ptr = 0x800E8210;
 nuGfxMesgQ = 0x800C4C28;
+nuGfxMesgBuf = 0x800BE1A0;
 
 nuBoot = 0x8007F880;
 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@@ -893,7 +894,6 @@ MQ_800BE030 = 0x800BE030;
 
 OSMESG_800BE190 = 0x800BE190;
 OSMESG_800BE194 = 0x800BE194;
-OSMESG_800BE1A0 = 0x800BE1A0;
 OSMESG_800B1870 = 0x800B1870;
 OSMESG_800B17D0 = 0x800B17D0;
 OSMESG_800B17E0 = 0x800B17E0;
diff --git a/src/_ob_grumpy_island.c b/src/_ob_grumpy_island.c
index 3f748f0..ee3103d 100644
--- a/src/_ob_grumpy_island.c
+++ b/src/_ob_grumpy_island.c
@@ -8,7 +8,7 @@ void gfxThread(void* arg0) {
     NUScMsg* mesgType;
     s16 temp_v0;
 
-    osCreateMesgQueue(&nuGfxMesgQ, OSMESG_800BE1A0, NU_GFX_MESGS);
+    osCreateMesgQueue(&nuGfxMesgQ, nuGfxMesgBuf, NU_GFX_MESGS);
     nuScAddClient(&gfxClient, &nuGfxMesgQ, NU_SC_RETRACE_MSG | NU_SC_PRENMI_MSG);
 
     while(1) {