diff --git a/configure.py b/configure.py
index b0f4d003..0fe32e28 100644
--- a/configure.py
+++ b/configure.py
@@ -865,7 +865,7 @@ config.libs = [
     EGGLib(
         "gfx",
         [
-            Object(NonMatching, "egg/gfx/eggCamera.cpp"),
+            Object(Matching, "egg/gfx/eggCamera.cpp"),
             Object(Matching, "egg/gfx/eggPalette.cpp"),
             Object(Matching, "egg/gfx/eggTexture.cpp"),
             Object(NonMatching, "egg/gfx/eggUnk1.cpp"),  # Unknown
diff --git a/src/egg/gfx/eggCamera.cpp b/src/egg/gfx/eggCamera.cpp
index 2417ba89..b99ed73c 100644
--- a/src/egg/gfx/eggCamera.cpp
+++ b/src/egg/gfx/eggCamera.cpp
@@ -26,8 +26,6 @@ Matrix34f &LookAtCamera::getViewMatrixOld() {
 }
 
 void LookAtCamera::doUpdateMatrix() {
-    // NONMATCHING
-
     mOtherMtx = mViewMtx;
 
     Vector3f right(mPos);
@@ -44,6 +42,8 @@ void LookAtCamera::doUpdateMatrix() {
     f32 ty = -up.dot(mPos);
     f32 tz = -right.dot(mPos);
 
+    f32 t[] = { tx, ty, tz};
+
     mViewMtx(0, 0) = forward(0);
     mViewMtx(0, 1) = forward(1);
     mViewMtx(0, 2) = forward(2);
diff --git a/src/egg/gfx/eggStateEfb.cpp b/src/egg/gfx/eggStateEfb.cpp
index 919d324e..a21cdf0b 100644
--- a/src/egg/gfx/eggStateEfb.cpp
+++ b/src/egg/gfx/eggStateEfb.cpp
@@ -51,12 +51,7 @@ TextureBuffer *StateEfb::captureEfb(BufferType type, bool noTransparencyMaybe, u
         switch (type) {
             case BUFFER_0:
             case BUFFER_1: {
-                f32 arg;
-                if (type == BUFFER_0) {
-                    arg = 0.25f;
-                } else {
-                    arg = 0.5f;
-                }
+                f32 arg = type == BUFFER_0 ? 0.25f : 0.5f;
 
                 sWorkSpaceV[2] = efb.vp.x2 * arg;
                 sWorkSpaceV[3] = efb.vp.y2 * arg;