diff --git a/deps/build.sh b/deps/build.sh
index 741df09f8..f8a184049 100755
--- a/deps/build.sh
+++ b/deps/build.sh
@@ -703,7 +703,7 @@ if [ "$WITH_UNWIND" = "yes" ];
             #eval autoheader
             #eval automake --add-missing
             eval autoreconf -i
-            eval ./configure --disable-shared --prefix="$INSTALL_ROOT"
+            eval ./configure --disable-shared --disable-tests --prefix="$INSTALL_ROOT"
             cd ..
         fi
         echo -e "${COLOR_INFO}building it${COLOR_DOTS}...${COLOR_RESET}"
@@ -1113,7 +1113,7 @@ then
 			#		..
 			#cd ../..
 			eval ./autogen.sh
-			eval ./configure "${CONF_CROSSCOMPILING_OPTS_GENERIC}" --enable-static --disable-shared --prefix="$INSTALL_ROOT" "${CONF_DEBUG_OPTIONS}"
+                        eval ./configure "${CONF_CROSSCOMPILING_OPTS_GENERIC}" --enable-static --disable-shared --disable-samples --prefix="$INSTALL_ROOT" "${CONF_DEBUG_OPTIONS}"
 			cd ..
 		fi
 		#cd libevent/build
@@ -1142,7 +1142,7 @@ then
 			if [ ! -f "libuv-from-git.tar.gz" ];
 			then
 				echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
-                eval git clone https://github.com/libuv/libuv.git
+                                eval git clone https://github.com/libuv/libuv.git
 				cd libuv
 				eval git checkout v1.x
 				eval git pull
@@ -1191,11 +1191,11 @@ then
 			if [ ! -f "libwebsockets-from-git.tar.gz" ];
 			then
 				echo -e "${COLOR_INFO}downloading it${COLOR_DOTS}...${COLOR_RESET}"
-                eval git clone https://github.com/warmcat/libwebsockets.git
+                                eval git clone https://github.com/warmcat/libwebsockets.git
 				eval cd libwebsockets
-                # eval git checkout v4.1-stable
-                eval git checkout v4.3-stable
-                eval git pull
+                                # eval git checkout v4.1-stable
+                                eval git checkout v4.3-stable
+                                eval git pull
 				cd ..
 				echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
 				eval tar -czf libwebsockets-from-git.tar.gz ./libwebsockets
@@ -1391,7 +1391,7 @@ then
 				eval "$WGET" https://boostorg.jfrog.io/artifactory/main/release/1.68.0/source/boost_1_68_0.tar.bz2
 			fi
 			echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
-            eval tar -xf boost_1_68_0.tar.bz2
+                        eval tar -xf boost_1_68_0.tar.bz2
 		fi
 		cd boost_1_68_0
 		echo -e "${COLOR_INFO}configuring and building it${COLOR_DOTS}...${COLOR_RESET}"
@@ -1996,10 +1996,10 @@ then
 			then
 				echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
 				eval git clone https://github.com/google/glog.git --recursive
-                cd glog
-                eval git checkout ee6faf13b20de9536f456bd84584f4ab4db1ceb4
-                cd ..
-                echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
+                                cd glog
+                                eval git checkout ee6faf13b20de9536f456bd84584f4ab4db1ceb4
+                                cd ..
+                                echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
 				eval tar -czf glog-from-git.tar.gz ./glog
 			else
 				echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
@@ -2010,7 +2010,7 @@ then
 			eval mkdir -p build
 			cd build
 			eval "$CMAKE" "${CMAKE_CROSSCOMPILING_OPTS}" -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" -DCMAKE_BUILD_TYPE="$TOP_CMAKE_BUILD_TYPE" \
-				-DBUILD_SHARED_LIBS=OFF -DWITH_UNWIND=OFF \
+                                -DBUILD_SHARED_LIBS=OFF -DWITH_UNWIND=OFF -DWITH_GTEST=OFF \
 				..
 			cd ..
 		else
@@ -2077,11 +2077,11 @@ then
 			then
 				echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
 				eval git clone https://github.com/facebook/folly.git --recursive
-                cd folly
-                eval git checkout 5c8fc1b622422a1c73f46d6fb51ac1164d8efb0f
-                cd ..
-                echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
-				eval tar -czf folly-from-git.tar.gz ./folly
+                                cd folly
+                                eval git checkout 5c8fc1b622422a1c73f46d6fb51ac1164d8efb0f
+                                cd ..
+                                echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
+                                eval tar -czf folly-from-git.tar.gz ./folly
 			else
 				echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
 				eval tar -xzf folly-from-git.tar.gz
@@ -2165,10 +2165,10 @@ then
 			then
 				echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
 				eval git clone https://github.com/google/googletest.git --recursive
-                cd googletest
-                eval git checkout 4c5650f68866e3c2e60361d5c4c95c6f335fb64b
-                cd ..
-                echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
+                                cd googletest
+                                eval git checkout 4c5650f68866e3c2e60361d5c4c95c6f335fb64b
+                                cd ..
+                                echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
 				eval tar -czf gtest-from-git.tar.gz ./googletest
 			else
 				echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
@@ -2208,10 +2208,10 @@ then
 			then
 				echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
 				eval git clone https://github.com/facebookincubator/fizz.git --recursive
-                cd fizz
-                eval git checkout 93003f4161f7cebe1c121b3232215db8314c2ce7
-                cd ..
-                echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
+                                cd fizz
+                                eval git checkout 93003f4161f7cebe1c121b3232215db8314c2ce7
+                                cd ..
+                                echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
 				eval tar -czf fizz-from-git.tar.gz ./fizz
 			else
 				echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
@@ -2253,10 +2253,10 @@ then
 			then
 				echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}"
 				eval git clone https://github.com/facebook/wangle.git --recursive
-                cd wangle
-                eval git checkout 7249d3f8d18bcd4bc13649d13654ccb2a771f7b3
-                cd ..
-                echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
+                                cd wangle
+                                eval git checkout 7249d3f8d18bcd4bc13649d13654ccb2a771f7b3
+                                cd ..
+                                echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}"
 				eval tar -czf wangle-from-git.tar.gz ./wangle
 			else
 				echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}"
diff --git a/skaled/CMakeLists.txt b/skaled/CMakeLists.txt
index 11209cad8..593119d59 100644
--- a/skaled/CMakeLists.txt
+++ b/skaled/CMakeLists.txt
@@ -25,8 +25,8 @@ target_link_libraries(
         devcore
         Boost::program_options
         skutils
-        "${DEPS_INSTALL_ROOT}/lib/liblzma.a"
         "${DEPS_INSTALL_ROOT}/lib/libunwind.a"
+        "${DEPS_INSTALL_ROOT}/lib/liblzma.a"
         pthread
         idn2
         batched-io
diff --git a/storage_benchmark/CMakeLists.txt b/storage_benchmark/CMakeLists.txt
index 1684ebe56..8180d42dc 100644
--- a/storage_benchmark/CMakeLists.txt
+++ b/storage_benchmark/CMakeLists.txt
@@ -20,8 +20,8 @@ target_link_libraries(
         historic
         skutils
         devcore
-        "${DEPS_INSTALL_ROOT}/lib/liblzma.a"
         "${DEPS_INSTALL_ROOT}/lib/libunwind.a"
+        "${DEPS_INSTALL_ROOT}/lib/liblzma.a"
     )
 
 #target_include_directories(evm_benchmark PRIVATE ../utils)