diff --git a/buildme b/buildme
index f32cb2220..f5ad307b0 100755
--- a/buildme
+++ b/buildme
@@ -20,6 +20,7 @@ COL_WHITE="\x1b[37;01m"
 COL_BLUE="\x1b[34;01m"
 COL_RESET="\x1b[39;49;00m"
 # ====== Main Window SetUp ======
+if [[ "$2" != ci ]]; then
 osascript <<EOF
 tell application "System Events" to tell application "Finder"
 	tell process "Terminal"
@@ -37,6 +38,7 @@ tell application "Terminal"
 #	set position of first window to {650, 420}
 end tell
 EOF
+fi
 # ====== Clover workspace SetUp ======
 cd "$(dirname $([ -L $0 ] && readlink $0 || echo $0))"
 declare -r CLOVERROOT="$PWD"
diff --git a/buildmtoc.sh b/buildmtoc.sh
index 6a9bb5a87..a59c3c1d9 100755
--- a/buildmtoc.sh
+++ b/buildmtoc.sh
@@ -197,7 +197,7 @@ fnCompileMtoc ()
 		if [[ ${OSXVER} < 10.15 ]]; then
 			cmd="(make LTO= EFITOOLS=efitools -C libstuff) && (make -C efitools)"
 		else
-			cmd="(xcodebuild -scheme mtoc -configuration Release ONLY_ACTIVE_ARCH=YES CONFIGURATION_BUILD_DIR=$PREFIX/bin)"
+			cmd="(xcodebuild -scheme mtoc -configuration Release ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES CONFIGURATION_BUILD_DIR=$PREFIX/bin)"
 		fi
     logfile="$DIR_LOGS/mtoc.make.log.txt"
     echo "$cmd" > "$logfile"