diff --git a/bin/smartlink b/bin/smartlink
index 029def268789a384ca63989b59c58f3ea351b2d2..f6671d7238477c7e5f255d4e1071e09d32ffe6a4 100755
--- a/bin/smartlink
+++ b/bin/smartlink
@@ -32,7 +32,8 @@ RPATH="$RPATH:${LD_LIBRARY_PATH-}"
 
 OLDIFS="$IFS"
 IFS=:
-set -- $RPATH
+set dummy $RPATH
+shift
 IFS="$OLDIFS"
 
 while test x$1 = x -a x$# != x0; do
diff --git a/src/modules/_Crypto/testsuite.in b/src/modules/_Crypto/testsuite.in
index 51fda6e50fca1d82a8a73acd3e14f57798d402a9..b165925f3e9337947b1d1d4d77907e745ff36f9a 100644
--- a/src/modules/_Crypto/testsuite.in
+++ b/src/modules/_Crypto/testsuite.in
@@ -17,6 +17,9 @@ test_true([[functionp(Crypto.des_parity)]])
 test_true([[functionp(Crypto.hex_to_string)]])
 test_true([[functionp(Crypto.string_to_hex)]])
 
+cond( [[ master()->resolv("Gmp")->mpz ]],
+[[
+
 // Pike programs
 test_true([[programp(Crypto.des3)]])
 test_true([[programp(Crypto.des3_cbc)]])
@@ -134,3 +137,4 @@ test_true([[objectp(Crypto.sha())]])
 test_eq([[Crypto.sha()->update("abc")->digest()]],
 	[[Crypto.hex_to_string("a9993e364706816aba3e25717850c26c9cd0d89d")]])
 
+]])
\ No newline at end of file