diff --git a/configure.py b/configure.py
index 368dd934d..67ed1cf26 100644
--- a/configure.py
+++ b/configure.py
@@ -836,7 +836,7 @@ config.libs = [
     JSystemLib(
         "J2DGraph",
         [
-            Object(NonMatching, "JSystem/J2DGraph/J2DGrafContext.cpp"),
+            Object(Matching,    "JSystem/J2DGraph/J2DGrafContext.cpp"),
             Object(Matching,    "JSystem/J2DGraph/J2DOrthoGraph.cpp"),
             Object(NonMatching, "JSystem/J2DGraph/J2DPrint.cpp"),
             Object(NonMatching, "JSystem/J2DGraph/J2DPane.cpp"),
@@ -1262,7 +1262,7 @@ config.libs = [
     ActorRel(NonMatching, "d_a_obj_doguu_demo"),
     ActorRel(NonMatching, "d_a_obj_gryw00"),
     ActorRel(NonMatching, "d_a_obj_hfuck1"),
-    ActorRel(Matching, "d_a_obj_hole", extra_cflags=["-sym off"]),
+    ActorRel(Matching,    "d_a_obj_hole", extra_cflags=["-sym off"]),
     ActorRel(NonMatching, "d_a_obj_ice"),
     ActorRel(NonMatching, "d_a_obj_ikada"),
     ActorRel(NonMatching, "d_a_obj_kanat"),
@@ -1370,7 +1370,7 @@ config.libs = [
     ActorRel(NonMatching, "d_a_oq"),
     ActorRel(NonMatching, "d_a_pedestal"),
     ActorRel(NonMatching, "d_a_saku"),
-    ActorRel(Matching, "d_a_seatag"),
+    ActorRel(Matching,    "d_a_seatag"),
     ActorRel(NonMatching, "d_a_shand"),
     ActorRel(NonMatching, "d_a_ship"),
     ActorRel(NonMatching, "d_a_shop_item"),
diff --git a/src/JSystem/J2DGraph/J2DGrafContext.cpp b/src/JSystem/J2DGraph/J2DGrafContext.cpp
index eb16557b9..2efcc6e18 100644
--- a/src/JSystem/J2DGraph/J2DGrafContext.cpp
+++ b/src/JSystem/J2DGraph/J2DGrafContext.cpp
@@ -19,9 +19,7 @@ J2DGrafContext::J2DGrafContext(f32 x, f32 y, f32 width, f32 height)
 void J2DGrafContext::setPort() {
     setScissor();
     setup2D();
-
-    JGeometry::TBox2<f32> bounds(mBounds);
-    GXSetViewport(bounds.i.x, bounds.i.y, bounds.getWidth(), bounds.getHeight(), 0.0f, 1.875f);
+    GXSetViewport(mBounds.i.x, mBounds.i.y, mBounds.getWidth(), mBounds.getHeight(), 0.0f, 1.0f);
 }
 
 static inline void GXSetTexCoordGen(GXTexCoordID dst, GXTexGenType type, GXTexGenSrc src, u32 mtx) {
diff --git a/src/JSystem/J2DGraph/J2DPane.cpp b/src/JSystem/J2DGraph/J2DPane.cpp
index 4eccae0fd..2acde8d2c 100644
--- a/src/JSystem/J2DGraph/J2DPane.cpp
+++ b/src/JSystem/J2DGraph/J2DPane.cpp
@@ -168,11 +168,11 @@ void J2DPane::draw(float x, float y, const J2DGrafContext* pCtx, bool clip) {
             if (clip) {
                 mDrawBounds.addPos(pParentPane->mScreenBounds.i.x, pParentPane->mScreenBounds.i.y);
                 mDrawBounds.intersect(pParentPane->mDrawBounds);
-                mDrawAlpha = mAlpha;
-
-                if (mInheritAlpha)
-                    mDrawAlpha = (mAlpha * pParentPane->mDrawAlpha) / 0xFF;
             }
+
+            mDrawAlpha = mAlpha;
+            if (mInheritAlpha)
+                mDrawAlpha = (mAlpha * pParentPane->mDrawAlpha) / 0xFF;
         } else {
             mScreenBounds.addPos(x, y);
             makeMatrix(mBounds.i.x + x, mBounds.i.y + y);
diff --git a/src/JSystem/J2DGraph/J2DScreen.cpp b/src/JSystem/J2DGraph/J2DScreen.cpp
index 2d648deb3..2c3f28312 100644
--- a/src/JSystem/J2DGraph/J2DScreen.cpp
+++ b/src/JSystem/J2DGraph/J2DScreen.cpp
@@ -179,7 +179,7 @@ J2DPane * J2DScreen::search(u32 tag) {
 /* 802D1180-802D12E0       .text drawSelf__9J2DScreenFffPA3_A4_f */
 void J2DScreen::drawSelf(f32 x, f32 y, Mtx* pMtx) {
     GXColor color = mColor;
-    u8 alpha = ((mColor.a * mAlpha) / 0xFF);
+    u8 alpha = ((color.a * mAlpha) / 0xFF);
     if (alpha == 0)
         return;
     color.a = alpha;