@@ -367,11 +367,11 @@
 	# Make sure GPG agent is running.
 	gpg --card-status &>/dev/null
 
 	local sock
 	if [ -d "$XDG_RUNTIME_DIR/gnupg" ]; then
-		sock=$(find $XDG_RUNTIME_DIR/gnupg -name S.gpg-agent.ssh |
+		sock=$(find "$XDG_RUNTIME_DIR/gnupg" -name S.gpg-agent.ssh |
 		       head -1)
 	fi
 	[ -n "$sock" ] || sock="$GNUPGHOME/S.gpg-agent.ssh"
 
 	alias gssh="SSH_AUTH_SOCK=$sock ssh"
@@ -565,16 +565,16 @@
 	switch)
 		if [ -z "$DEVKITPRO" ]; then
 			echo "Please set DEVKITPRO!"
 			return 1
 		fi
-		if [ -z $"DEVKITA64" ]; then
+		if [ -z "$DEVKITA64" ]; then
 			echo "Please set DEVKITA64!"
 			return 1
 		fi
 
-		export PATH="$DEVKITA64/bin:$PATH"
+		export PATH="$DEVKITA64/bin:$DEVKITPRO/tools/bin:$PATH"
 		export cross_host="aarch64-none-elf"
 		export objfw_configure_flags="--with-$1"
 		;;
 	wii | wii-u)
 		if [ -z "$DEVKITPRO" ]; then