diff --git a/lib/src/libc/ll.c b/lib/src/libc/ll.c
index 2d211582..3dd1eb44 100644
--- a/lib/src/libc/ll.c
+++ b/lib/src/libc/ll.c
@@ -4,7 +4,7 @@
 #include "types.h"
 #include "macros.h"
 
-#if 00
+#if 0
 //Thse need to be compiled with -mips3, and linked differently
 unsigned long long __ull_rshift(unsigned long long a0, unsigned long long a1)
 {
@@ -49,7 +49,6 @@ long long __ll_mod(long long a0, long long a1)
     long long tmp = a0 % a1;
     if ((tmp < 0 && a1 > 0) || (tmp > 0 && a1 < 0))
     {
-
         tmp += a1; 
     }
     return tmp;
diff --git a/lib/src/libc/llcvt.c b/lib/src/libc/llcvt.c
index 19914abb..5d7b6b52 100644
--- a/lib/src/libc/llcvt.c
+++ b/lib/src/libc/llcvt.c
@@ -1,7 +1,7 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x800C9B30 */
 
-#if 00
+#if 0
 //This needs to be compiled with mips3, which isn't yet supported
 long long __d_to_ll(double d) {
    return d;
@@ -30,7 +30,6 @@ float __ull_to_f(unsigned long long u) {
 #else
 #include "types.h"
 #include "macros.h"
-
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/__d_to_ll.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/__f_to_ll.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/__ll_to_f.s")
diff --git a/lib/src/mips1/al/alSynAllocFX.c b/lib/src/mips1/al/alSynAllocFX.c
index 290aff0f..ba08be57 100644
--- a/lib/src/mips1/al/alSynAllocFX.c
+++ b/lib/src/mips1/al/alSynAllocFX.c
@@ -5,17 +5,17 @@
 #include "macros.h"
 #include "audio_internal.h"
 
-#if 00
-void alFxNew(ALFx *r, ALSynConfig *c, ALHeap *hp);
+#ifdef NON_MATCHING
+void alFxNew(ALFx *r, ALSynConfig *c, s16 bus);
 s32 alFxParam(void *filter, s32 paramID, void *param);
 s32 alMainBusParam(void *filter, s32 paramID, void *param);
 // This is very close to matching.
 ALFxRef *alSynAllocFX(ALSynth *s, s16 bus, ALSynConfig *c, ALHeap *hp)
 {
-    alFxNew(&s->auxBus[bus].fx[0], c, hp);
-    alFxParam(&s->auxBus[bus].fx[0], AL_FILTER_SET_SOURCE,
+    alFxNew(s->auxBus[bus].fx, c, bus);
+    alFxParam(s->auxBus[bus].fx, AL_FILTER_SET_SOURCE,
                   &s->auxBus[bus]);
-    alMainBusParam(s->mainBus, AL_FILTER_ADD_SOURCE,&s->auxBus[bus].fx[0]);
+    alMainBusParam(s->mainBus, AL_FILTER_ADD_SOURCE, s->auxBus[bus].fx);
 
     return (ALFxRef)(&s->auxBus[bus].fx[0]);
 }
diff --git a/src/camera.c b/src/camera.c
index ba88c0ed..1fb24dd4 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -140,7 +140,7 @@ u8 D_80121150[16];
 
 /******************************/
 
-#if 00
+#ifdef NON_MATCHING
 extern s32 D_B0000578;
 
 void func_80065EA0(void) {
@@ -166,7 +166,7 @@ void func_80065EA0(void) {
     if ((D_B0000578 & 0xFFFF) != 0x8965) {
         D_800DD060 = 1;
     }
-    guPerspectiveF(D_80120EE0, perspNorm[5], CAMERA_DEFAULT_FOV, CAMERA_ASPECT, CAMERA_NEAR, CAMERA_FAR, CAMERA_SCALE);
+    guPerspectiveF(D_80120EE0, &perspNorm[5], CAMERA_DEFAULT_FOV, CAMERA_ASPECT, CAMERA_NEAR, CAMERA_FAR, CAMERA_SCALE);
     func_8006F870(D_80120EE0, D_80120FE0);
     gCurCamFOV = CAMERA_DEFAULT_FOV;
 }