diff --git a/GNUmakefile b/GNUmakefile
index b381ce2a..637c0708 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -739,8 +739,8 @@ endif
 
 # Cryptogams AES for ARMv4 and above. We couple to ARMv7.
 ifeq ($(IS_ARM32),1)
-CRYPTOGAMS_AES_ARCH = -march=armv7-a
-CRYPTOGAMS_AES_ARCH += -Wa,--noexecstack
+CRYPTOGAMS_AES_FLAG = -march=armv7-a
+CRYPTOGAMS_AES_FLAG += -Wa,--noexecstack
 SRCS += aes-armv4.S
 endif
 
@@ -1091,7 +1091,7 @@ endif # Dependencies
 
 # Cryptogams ARM asm implementation.
 aes-armv4.o : aes-armv4.S
-	$(CC) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_ARCH) -mfloat-abi=$(FP_ABI) -c) $<
+	$(CC) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_FLAG) -mfloat-abi=$(FP_ABI) -c) $<
 
 # SSSE3 or NEON available
 aria-simd.o : aria-simd.cpp
diff --git a/GNUmakefile-cross b/GNUmakefile-cross
index 451b7a51..cc5e4e75 100755
--- a/GNUmakefile-cross
+++ b/GNUmakefile-cross
@@ -327,8 +327,8 @@ INCL := $(filter-out resource.h,$(sort $(wildcard *.h)))
 
 # Cryptogams AES for ARMv4 and above. We couple to ARMv7.
 ifeq ($(IS_ARM32),1)
-CRYPTOGAMS_AES_ARCH = -march=armv7-a
-CRYPTOGAMS_AES_ARCH += -Wa,--noexecstack
+CRYPTOGAMS_AES_FLAG = -march=armv7-a
+CRYPTOGAMS_AES_FLAG += -Wa,--noexecstack
 SRCS += aes-armv4.S
 endif
 
@@ -519,7 +519,7 @@ cpu-features.o: cpu-features.h cpu-features.c
 
 # Cryptogams ARM asm implementation.
 aes-armv4.o : aes-armv4.S
-	$(CXX) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_ARCH) -c) $<
+	$(CXX) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_FLAG) -c) $<
 
 # SSE4.2 or NEON available
 aria-simd.o : aria-simd.cpp
diff --git a/TestScripts/cryptest-android.sh b/TestScripts/cryptest-android.sh
index b0b6f6fb..85b3b2f5 100755
--- a/TestScripts/cryptest-android.sh
+++ b/TestScripts/cryptest-android.sh
@@ -31,29 +31,31 @@ do
 		# Test if we can set the environment for the platform
 		./setenv-android-gcc.sh "$platform" "$runtime"
 
-		if [ "$?" -eq "0" ];
+		if [ "$?" -ne "0" ];
 		then
-			echo
-			echo "Building for $platform using $runtime..."
-			echo
-
-			# run in subshell to not keep any env vars
-			(
-				source ./setenv-android-gcc.sh "$platform" "$runtime" > /dev/null 2>&1
-				make -f GNUmakefile-cross static dynamic cryptest.exe
-				if [ "$?" -eq "0" ]; then
-					echo "$platform:$runtime ==> SUCCESS" >> /tmp/build.log
-				else
-					echo "$platform:$runtime ==> FAILURE" >> /tmp/build.log
-					touch /tmp/build.failed
-				fi
-			)
-		else
 			echo
 			echo "There were problems testing $platform with $runtime"
 			echo "$platform:$runtime ==> FAILURE" >> /tmp/build.log
+
 			touch /tmp/build.failed
+			continue
 		fi
+
+		echo
+		echo "Building for $platform using $runtime..."
+		echo
+
+		# run in subshell to not keep any env vars
+		(
+			source ./setenv-android-gcc.sh "$platform" "$runtime" > /dev/null 2>&1
+			make -f GNUmakefile-cross static dynamic cryptest.exe
+			if [ "$?" -eq "0" ]; then
+				echo "$platform:$runtime ==> SUCCESS" >> /tmp/build.log
+			else
+				echo "$platform:$runtime ==> FAILURE" >> /tmp/build.log
+				touch /tmp/build.failed
+			fi
+		)
 	done
 done
 
diff --git a/TestScripts/cryptest-ios.sh b/TestScripts/cryptest-ios.sh
index 130f5dce..44466574 100755
--- a/TestScripts/cryptest-ios.sh
+++ b/TestScripts/cryptest-ios.sh
@@ -27,28 +27,31 @@ do
 	# Test if we can set the environment for the platform
 	./setenv-ios.sh "$platform"
 
-	if [ "$?" -eq "0" ]; then
-		echo
-		echo "Building for $platform using $runtime..."
-		echo
-
-		# run in subshell to not keep any env vars
-		(
-			. ./setenv-ios.sh "$platform" > /dev/null 2>&1
-			make -f GNUmakefile-cross static dynamic cryptest.exe
-			if [ "$?" -eq "0" ]; then
-				echo "$platform ==> SUCCESS" >> /tmp/build.log
-			else
-				echo "$platform ==> FAILURE" >> /tmp/build.log
-				touch /tmp/build.failed
-			fi
-		)
-	else
+	if [ "$?" -ne "0" ];
+	then
 		echo
 		echo "$platform not supported by Xcode"
 		echo "$platform ==> FAILURE" >> /tmp/build.log
+
 		touch /tmp/build.failed
+		continue
 	fi
+
+	echo
+	echo "Building for $platform using $runtime..."
+	echo
+
+	# run in subshell to not keep any env vars
+	(
+		source ./setenv-ios.sh "$platform" > /dev/null 2>&1
+		make -f GNUmakefile-cross static dynamic cryptest.exe
+		if [ "$?" -eq "0" ]; then
+			echo "$platform ==> SUCCESS" >> /tmp/build.log
+		else
+			echo "$platform ==> FAILURE" >> /tmp/build.log
+			touch /tmp/build.failed
+		fi
+	)
 done
 
 cat /tmp/build.log