diff --git a/lib/build.sh b/lib/build.sh
index 8c07682..12f7a17 100644
--- a/lib/build.sh
+++ b/lib/build.sh
@@ -925,7 +925,9 @@ meta_configure_build() {
 		"${configureFlags[@]}" \
 		"${addFlags[@]}" || return 1
 	# build
-	ccache make -j"${JOBS}" || return 1
+	# attempt to build twice since build can fail due to OOM
+	ccache make -j"${JOBS}" ||
+		ccache make -j"${JOBS}" || return 1
 	# install
 	local destdir="${PWD}/fb-local-install"
 	make -j"${JOBS}" DESTDIR="${destdir}" install || return 1
diff --git a/lib/ffmpeg.sh b/lib/ffmpeg.sh
index 43a9d36..de0ebba 100644
--- a/lib/ffmpeg.sh
+++ b/lib/ffmpeg.sh
@@ -139,11 +139,14 @@ gen_video() {
 		'2160p') resolution='3840x2160' ;;
 		'grain=yes') vf+=",noise=alls=15:allf=t+u" ;;
 		'hdr=yes')
-			vf+=",setparams=color_primaries=bt2020:color_trc=smpte2084:colorspace=bt2020nc"
+			local colorPrimaries='bt2020'
+			local colorTrc='smpte2084'
+			local colorspace='bt2020nc'
+			vf+=",setparams=color_primaries=${colorPrimaries}:color_trc=${colorTrc}:colorspace=${colorspace}"
 			addFlags+=(
-				-color_primaries bt2020
-				-color_trc smpte2084
-				-colorspace bt2020nc
+				-color_primaries "${colorPrimaries}"
+				-color_trc "${colorTrc}"
+				-colorspace "${colorspace}"
 				-metadata:s:v:0 "mastering_display_metadata=G(13250,34500)B(7500,3000)R(34000,16000)WP(15635,16450)L(10000000,1)"
 				-metadata:s:v:0 "content_light_level=1000,400"
 			)
@@ -152,7 +155,7 @@ gen_video() {
 		esac
 	done
 
-	ffmpeg -y \
+	echo_if_fail ffmpeg -y \
 		-hide_banner \
 		-f lavfi \
 		-i "testsrc2=size=${resolution}:rate=24:duration=5" \
diff --git a/lib/install_deps.sh b/lib/install_deps.sh
index 78f134e..196fdba 100644
--- a/lib/install_deps.sh
+++ b/lib/install_deps.sh
@@ -72,7 +72,7 @@ print_req_pkgs() {
 	# shellcheck disable=SC2034
 	local pacman_pkgs=(
 		"${common_linux_pkgs[@]}" base-devel
-		python-pipx ninja lld
+		python-pipx ninja lld mkvtoolnix-cli
 	)
 	# shellcheck disable=SC2034
 	local dnf_pkgs=(
@@ -82,6 +82,7 @@ print_req_pkgs() {
 		libstdc++-static libstdc++-devel
 		llvm-cmake-utils llvm-devel
 		llvm-static compiler-rt lld
+		mkvtoolnix
 	)
 	# shellcheck disable=SC2034
 	local pkg_pkgs=(
diff --git a/lib/utils.sh b/lib/utils.sh
index 2b2fd5f..a92c378 100644
--- a/lib/utils.sh
+++ b/lib/utils.sh
@@ -67,7 +67,7 @@ echo_if_fail() {
 
 	if ! test ${retval} -eq 0; then
 		echo
-		echo_fail "command failed:"
+		echo_fail "command failed with ${retval}:"
 		printf "%s\n" "${cmdEvalLines[@]}"
 		echo_warn "command stdout:"
 		tail -n 32 "${out}"