diff --git a/apps/netconf/Makefile.in b/apps/netconf/Makefile.in
index 7f7ab0b6..43025097 100644
--- a/apps/netconf/Makefile.in
+++ b/apps/netconf/Makefile.in
@@ -54,6 +54,7 @@ includedir	= @includedir@
 HOST_VENDOR     = @host_vendor@
 
 SH_SUFFIX	= @SH_SUFFIX@
+LIBSTATIC_SUFFIX = @LIBSTATIC_SUFFIX@
 
 CLIXON_MAJOR    = @CLIXON_VERSION_MAJOR@
 CLIXON_MINOR    = @CLIXON_VERSION_MINOR@
diff --git a/test/test_nacm_module_read.sh b/test/test_nacm_module_read.sh
index 42e3f9e2..e0506efe 100755
--- a/test/test_nacm_module_read.sh
+++ b/test/test_nacm_module_read.sh
@@ -229,7 +229,7 @@ expectpart "$(curl -u andy:bar $CURLOPTS -X GET $RCPROTO://localhost/restconf/da
 new "admin read top ok (all)"
 ret=$(curl -u andy:bar $CURLOPTS -X GET $RCPROTO://localhost/restconf/data)
 expect='{"ietf-restconf:data":{"clixon-example:table":'
-match=`echo $ret | grep --null -Eo "$expect"`
+match=`echo $ret | grep "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh
index d378a28b..3ee7f496 100755
--- a/test/test_yang_namespace.sh
+++ b/test/test_yang_namespace.sh
@@ -122,7 +122,7 @@ expectpart "$(curl $CURLOPTS -X POST -H "Content-Type: application/yang-data+jso
 new "restconf get config example1 and example2"
 ret=$(curl $CURLOPTS -X GET $RCPROTO://localhost/restconf/data)
 expect='"example1:x":42,"example2:x":{"y":99}'
-match=`echo $ret | grep --null -Eo "$expect"`
+match=`echo $ret | grep "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
diff --git a/test/vagrant/vagrant.sh b/test/vagrant/vagrant.sh
index eeb91532..de5948b5 100755
--- a/test/vagrant/vagrant.sh
+++ b/test/vagrant/vagrant.sh
@@ -73,6 +73,7 @@ Vagrant.configure("2") do |config|
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://vagrantcloud.com/search.
   config.vm.box = "$box"
+  config.vm.box_download_insecure=true # 2021-04 required, hope this changes?
   if Vagrant.has_plugin?("vagrant-vbguest")
     config.vbguest.auto_update = false
   end
@@ -195,6 +196,9 @@ case $release in
 	esac
 	;;
     ubuntu) # ubuntu/apt based
+        # enable ipv6
+        $sshcmd sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
+
 	$sshcmd sudo apt-get update --fix-missing
 	$sshcmd sudo apt install -y git
 	# restconf user: $wwwuser
@@ -300,6 +304,7 @@ chmod 755 $dir/yangmodels.sh
 $scpcmd $dir/yangmodels.sh vagrant@127.0.0.1:
 $sshcmd sudo ./yangmodels.sh
 
+
 # Run tests
 $sshcmd "(cd src/cligen/test; ./sum.sh)"
 $sshcmd "(cd src/clixon/test; ./sum.sh)"