diff --git a/rel/famicom_emu.c b/rel/famicom_emu.c
index e43e63bb..a66e2f55 100644
--- a/rel/famicom_emu.c
+++ b/rel/famicom_emu.c
@@ -169,7 +169,7 @@ void famicom_emu_init(GAME_FAMICOM_EMU* famicom){
     manager = JC_JFWDisplay_getManager();
     render = JC_JFWDisplay_getRenderMode(manager); 
     freeXfbBase = JC_JFWDisplay_changeToSingleXfb(manager, 1);
-    freeXfbSize = render->efbHeight * render->viXOrigin * sizeof(u16);
+    freeXfbSize = render->fbWidth * render->xfbHeight * sizeof(u16);
 
     my_alloc_init(famicom, freeXfbBase, freeXfbSize);
 
@@ -180,7 +180,7 @@ void famicom_emu_init(GAME_FAMICOM_EMU* famicom){
 }
 
 
-void famicom_emu_cleanup(GAME*){
+void famicom_emu_cleanup(GAME* game){
 
     JC_JFWDisplay_startFadeIn(JC_JFWDisplay_getManager(), 1);
 
diff --git a/rel/m_camera2.c b/rel/m_camera2.c
index 47e1d3b6..c48ac135 100644
--- a/rel/m_camera2.c
+++ b/rel/m_camera2.c
@@ -7,6 +7,7 @@
 #include "m_player_lib.h"
 #include "m_room_type.h"
 #include "m_collision_bg.h"
+#include "m_scene_table.h"
 #include "m_common_data.h"
 
 #ifdef MUST_MATCH
diff --git a/tools/ppcdis b/tools/ppcdis
index b49c7feb..ef5a43f0 160000
--- a/tools/ppcdis
+++ b/tools/ppcdis
@@ -1 +1 @@
-Subproject commit b49c7feb305e562d5d4503fc117bf9020f941ef8
+Subproject commit ef5a43f0e09f3aa3a694d14ab9a777f7254b60be