diff --git a/TestScripts/cryptest-autotools.sh b/TestScripts/cryptest-autotools.sh
index dffb8c42..1c578d30 100755
--- a/TestScripts/cryptest-autotools.sh
+++ b/TestScripts/cryptest-autotools.sh
@@ -58,15 +58,24 @@ fi
 #	mv libcryptopp.pc.in.fixed libcryptopp.pc.in
 #fi
 
+# Run autoreconf twice on failure. Also see
+# https://github.com/tracebox/tracebox/issues/57
+
 mkdir -p m4/
 
 if [[ ! -z $(command -v autoupdate) ]]; then
 	autoupdate
 fi
 
-if ! autoreconf --force --install --warnings=all; then
-	echo "autoreconf failed"
-	[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
+if [[ ! -z $(command -v libtoolize) ]]; then
+	libtoolize
+fi
+
+if ! autoreconf -vfi --warnings=all; then
+	if ! autoreconf -vfi; then
+		echo "autoreconf failed"
+		[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
+	fi
 fi
 
 if ! ./configure; then
diff --git a/padlkrng.cpp b/padlkrng.cpp
index e7e1cc2b..0a3620e4 100644
--- a/padlkrng.cpp
+++ b/padlkrng.cpp
@@ -52,9 +52,9 @@ void PadlockRNG::GenerateBlock(byte *output, size_t size)
 
 			: "=g" (m_msr) : "g" (m_buffer.data()), "g" (m_divisor)
 #if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
-			: "rax", "rbx", "rdx", "rdi", "cc"
+			: "rax", "rdx", "rdi", "cc"
 #else
-			: "eax", "ebx", "edx", "edi", "cc"
+			: "eax", "edx", "edi", "cc"
 #endif
 		);