diff --git a/include/common.h b/include/common.h
index c97f399..99fb9c6 100644
--- a/include/common.h
+++ b/include/common.h
@@ -133,7 +133,6 @@ extern s32 D_A9EF0;
 extern s32 D_800C4B30;
 
 extern OSPiHandle* CART_HANDLE;
-extern OSMesg OSMESG_800BE048[0x32];
 
 extern OSMesgQueue MQ_800E7988;
 
diff --git a/include/nu/nusys.h b/include/nu/nusys.h
index e15838a..8911632 100644
--- a/include/nu/nusys.h
+++ b/include/nu/nusys.h
@@ -729,6 +729,7 @@ extern NUCallBackList*	nuSiCallBackList;/* Callback function list */
 /*  pi variables 			*/
 /*--------------------------------------*/
 extern OSMesgQueue	nuPiMgrMesgQ;	/* PI Manager queue */
+extern OSMesg nuPiMesgBuf[NU_PI_MESG_NUM];
 extern OSPiHandle*	nuPiCartHandle;
 extern OSPiHandle*	nuPiSramHandle;
 extern OSPiHandle*	nuPiDDRomHandle;
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index 2be48e8..577f3cf 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -30,6 +30,7 @@ nuThreadIdle = 0x800AF440;
 nuStackIdle = 0x800B17A0;
 nuPiCartHandle = 0x800E7A20;
 nuPiMgrMesgQ = 0x800BE030;
+nuPiMesgBuf = 0x800BE048;
 
 nuBoot = 0x8007F880;
 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@@ -923,7 +924,6 @@ OSMESG_800BE194 = 0x800BE194;
 OSMESG_800B1870 = 0x800B1870;
 OSMESG_800B17D0 = 0x800B17D0;
 OSMESG_800B17E0 = 0x800B17E0;
-OSMESG_800BE048 = 0x800BE048;
 OSMESG_800B9C58 = 0x800B9C58;
 OSMESG_800B9C80 = 0x800B9C80;
 
diff --git a/src/_ob_icy_coast.c b/src/_ob_icy_coast.c
index 943dc1d..7a8d57c 100644
--- a/src/_ob_icy_coast.c
+++ b/src/_ob_icy_coast.c
@@ -48,7 +48,7 @@ void nuSiMgrRestart(void) {
 INCLUDE_ASM(const s32, "_ob_icy_coast", nuSiMgrThread);
 
 void nuPiInit(void) {
-    osCreatePiManager(OS_PRIORITY_PIMGR, &nuPiMgrMesgQ, OSMESG_800BE048, sizeof(OSMESG_800BE048) / sizeof(OSMesg));
+    osCreatePiManager(OS_PRIORITY_PIMGR, &nuPiMgrMesgQ, nuPiMesgBuf, NU_PI_MESG_NUM);
     nuPiCartHandle = osCartRomInit();
 }