diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h
index 0b6f3bf1f..96cd12474 100644
--- a/include/JSystem/J2DGraph/J2DPane.h
+++ b/include/JSystem/J2DGraph/J2DPane.h
@@ -53,10 +53,17 @@ public:
         mBounds.f.x = mBounds.i.x + w;
         mBounds.f.y = mBounds.i.y + h;
     }
-    virtual bool setConnectParent(bool connected);
-    virtual void calcMtx();
-    virtual void update();
-    virtual void drawSelf(f32 x, f32 y);
+    virtual bool setConnectParent(bool connected) {
+        mIsConnectParent = 0;
+        return false;
+    }
+    virtual void calcMtx() {
+        if (mPaneTree.mList) {
+            makeMatrix(mBounds.i.x, mBounds.i.y);
+        }
+    }
+    virtual void update() {}
+    virtual void drawSelf(f32 x, f32 y) {}
     virtual void drawSelf(f32 x, f32 y, Mtx* mtx) {}
     virtual J2DPane* search(u32 tag);
     virtual void makeMatrix(f32, f32);
diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h
index abb291fc5..807086913 100644
--- a/include/JSystem/J2DGraph/J2DPicture.h
+++ b/include/JSystem/J2DGraph/J2DPicture.h
@@ -27,8 +27,14 @@ public:
     virtual u16 getTypeID() { return 0x12; }
     virtual void drawSelf(f32 x, f32 y);
     virtual void drawSelf(f32 x, f32 y, Mtx* mtx);
-    virtual void drawOut(f32, f32, f32, f32, f32, f32);
-    virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32);
+    virtual void drawOut(f32 p1, f32 p2, f32 p3, f32 p4, f32 p5, f32 p6) {
+        if (mpTexture[0]) {
+            drawOut(JGeometry::TBox2<f32>(p1, p2, p1 + p3, p2 + p4), JGeometry::TBox2<f32>(p5, p6, p5 + mpTexture[0]->getWidth(), p6 + mpTexture[0]->getHeight()));
+        }
+    }
+    virtual void drawOut(f32 p1, f32 p2, f32 p3, f32 p4, f32 p5, f32 p6, f32 p7, f32 p8) {
+        drawOut(JGeometry::TBox2<f32>(p1, p2, p1 + p3, p2 + p4), JGeometry::TBox2<f32>(p5, p6, p5 + p7, p6 + p8));
+    }
     JUTTexture * getTexture(u8 idx) const {
         return idx < mNumTexture ? mpTexture[idx] : NULL;
     }
diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h
index 17ab59ee8..9b9d38038 100644
--- a/include/JSystem/JUtility/JUTFont.h
+++ b/include/JSystem/JUtility/JUTFont.h
@@ -83,9 +83,9 @@ public:
     /* 0x3C */ virtual const ResFONT* getResFont() const = 0;
     /* 0x40 */ virtual bool isLeadByte(int a1) const = 0;
 
-    static bool isLeadByte_1Byte(int b);
-    static bool isLeadByte_2Byte(int b);
-    static bool isLeadByte_ShiftJIS(int b);
+    static bool isLeadByte_1Byte(int b) { return false; }
+    static bool isLeadByte_2Byte(int b) { return true; }
+    static bool isLeadByte_ShiftJIS(int b) { return (b >= 0x81 && b <= 0x9f) || (b >= 0xe0 && b <= 0xfc);}
 
     void initialize_state();
     void setCharColor(JUtility::TColor col1);