diff --git a/Makefile b/Makefile
index 35623679de..dc86dfee86 100644
--- a/Makefile
+++ b/Makefile
@@ -833,8 +833,10 @@ COM_PLUGIN := tools/com-plugin/common-plugin.so
 
 LDFLAGS := -T $(LDSCRIPT) -T $(BUILD_DIR)/linker_scripts/makerom.ld -T $(BUILD_DIR)/undefined_syms.txt --no-check-sections --accept-unknown-input-arch --emit-relocs -Map $(MAP)
 ifeq ($(PLATFORM),IQUE)
-  LDFLAGS += -plugin $(COM_PLUGIN) -plugin-opt order=$(BASEROM_DIR)/bss-order.txt
-  $(ELF): $(BASEROM_DIR)/bss-order.txt
+  ifeq ($(NON_MATCHING),0)
+    LDFLAGS += -plugin $(COM_PLUGIN) -plugin-opt order=$(BASEROM_DIR)/bss-order.txt
+    $(ELF): $(BASEROM_DIR)/bss-order.txt
+  endif
 endif
 
 $(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) $(OVL_RELOC_FILES) $(LDSCRIPT) $(BUILD_DIR)/linker_scripts/makerom.ld $(BUILD_DIR)/undefined_syms.txt \
diff --git a/spec/code_libultra_ique.inc b/spec/code_libultra_ique.inc
index 4e53234778..e99152cf98 100644
--- a/spec/code_libultra_ique.inc
+++ b/spec/code_libultra_ique.inc
@@ -101,7 +101,9 @@
     include "$(BUILD_DIR)/src/libultra/gu/rotate.o"
     include "$(BUILD_DIR)/src/libultra/os/getcurrfaultedthread.o"
     include "$(BUILD_DIR)/src/libultra/bb/sk/skapi.o"
+#ifndef COMPILER_GCC
     include "$(BUILD_DIR)/src/libultra/bb/sa/common.o"
+#endif
     include "$(BUILD_DIR)/src/libultra/io/motor.o"
     include "$(BUILD_DIR)/src/libultra/os/afterprenmi.o"
     include "$(BUILD_DIR)/src/libultra/audio/drvrnew.o"
diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c
index 29d04071c6..57db7232fe 100644
--- a/src/code/fault_gc.c
+++ b/src/code/fault_gc.c
@@ -40,14 +40,15 @@
  * DPad-Up may be pressed to enable sending fault pages over osSyncPrintf as well as displaying them on-screen.
  * DPad-Down disables sending fault pages over osSyncPrintf.
  */
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-eu-mq-dbg:96 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128" \
-                               "gc-us-mq:128 ique-cn:128"
+#pragma increment_block_number "gc-eu:96 gc-eu-mq:96 gc-eu-mq-dbg:96 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96" \
+                               "gc-us-mq:96 ique-cn:96"
 
 #include "global.h"
 #include "libc64/sleep.h"
 #include "libc64/sprintf.h"
 #include "alloca.h"
 #include "controller.h"
+#include "padmgr.h"
 #include "fault.h"
 #include "stack.h"
 #include "stackcheck.h"