diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e2fd7517..8b0c7256 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,18 +9,9 @@ jobs:
     strategy:
       matrix:
         image: ["Wii", "GameCube"]
-    container: devkitpro/devkitppc:latest
+    container: ghcr.io/extremscorner/libogc2:latest
 
     steps:
-    - name: Install packages
-      run: |
-        sudo dkp-pacman-key --recv-keys C8A2759C315CFBC3429CC2E422B803BA8AA3D7CE --keyserver keyserver.ubuntu.com
-        sudo dkp-pacman-key --lsign-key C8A2759C315CFBC3429CC2E422B803BA8AA3D7CE
-        sudo sed -i '/^\[dkp-libs\]$/,$d' /opt/devkitpro/pacman/etc/pacman.conf
-        sudo echo -e '[extremscorner-devkitpro]\nServer = https://packages.extremscorner.org/devkitpro/linux/$arch' >> /opt/devkitpro/pacman/etc/pacman.conf
-        sudo dkp-pacman -Sy
-        sudo dkp-pacman -S --noconfirm --ask 4 gamecube-tools-git libogc2 libogc2-libdvm
-
     - name: Checkout vbagx repo
       uses: actions/checkout@v4
       with:
diff --git a/buildtools/libfreetype.a b/buildtools/libfreetype.a
deleted file mode 100644
index 1d6913c1..00000000
Binary files a/buildtools/libfreetype.a and /dev/null differ
diff --git a/buildtools/libfreetype.la b/buildtools/libfreetype.la
deleted file mode 100644
index 0ce7efc8..00000000
--- a/buildtools/libfreetype.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libfreetype.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6b
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libfreetype.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L$DEVKITPRO/ppc/lib -lz'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libfreetype.
-current=12
-age=6
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='$DEVKITPRO/portlibs/ppc/lib'
diff --git a/source/fileop.cpp b/source/fileop.cpp
index 73a5a7ee..2ed16c80 100644
--- a/source/fileop.cpp
+++ b/source/fileop.cpp
@@ -52,9 +52,6 @@ bool isMounted[9] = { false, false, false, false, false, false, false, false, fa
 	static DISC_INTERFACE* usb = &__io_usbstorage;
 	static DISC_INTERFACE* dvd = &__io_wiidvd;
 #else
-	static DISC_INTERFACE* carda = &__io_gcsda;
-	static DISC_INTERFACE* cardb = &__io_gcsdb;
-	static DISC_INTERFACE* port2 = &__io_gcsd2;
 	static DISC_INTERFACE* dvd = &__io_gcdvd;
 	static DISC_INTERFACE* gcloader = &__io_gcode;
 #endif
@@ -245,17 +242,17 @@ static bool MountFAT(int device, int silent)
 		case DEVICE_SD_SLOTA:
 			sprintf(name, "carda");
 			sprintf(name2, "carda:");
-			disc = carda;
+			disc = get_io_gcsda();
 			break;
 		case DEVICE_SD_SLOTB:
 			sprintf(name, "cardb");
 			sprintf(name2, "cardb:");
-			disc = cardb;
+			disc = get_io_gcsdb();
 			break;
 		case DEVICE_SD_PORT2:
 			sprintf(name, "port2");
 			sprintf(name2, "port2:");
-			disc = port2;
+			disc = get_io_gcsd2();
 			break;
 		case DEVICE_SD_GCLOADER:
 			sprintf(name, "gcloader");
diff --git a/source/menu.cpp b/source/menu.cpp
index 70fa20f8..cafa7deb 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -512,7 +512,7 @@ static void * ProgressThread (void *arg)
 void
 InitGUIThreads()
 {
-	LWP_CreateThread (&guithread, UpdateGUI, NULL, NULL, 0, 70);
+	LWP_CreateThread (&guithread, UpdateGUI, NULL, NULL, 24576, 70);
 	LWP_CreateThread (&progressthread, ProgressThread, NULL, NULL, 0, 40);
 }