diff --git a/Makefile b/Makefile
index 9f4db91c476ff7f37133a41af8e7179986fb354f..71227d9d4d11e7bc700e701a8d4df39cf943efda 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ BUILD_VERSION := $(MAPLE_BUILD_VERSION)
 GIT_REVISION := $(shell  git log --pretty=format:"%H" -1)
 MAST := 0
 ASAN := 0
+ONLY_C := 0
 ifeq ($(DEBUG),0)
   BUILD_TYPE := RELEASE
 else
@@ -56,7 +57,8 @@ GN_OPTIONS := \
   BUILD_VERSION="$(BUILD_VERSION)" \
   GIT_REVISION="$(GIT_REVISION)" \
   MAST=$(MAST) \
-  ASAN=$(ASAN)
+  ASAN=$(ASAN) \
+  ONLY_C=$(ONLY_C)
 
 .PHONY: default
 default: install
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 5f0817677a4d816c4b5fb220cfbbf7077d70e5dc..efe75a739dccc3c7aab81a16bd9b50ff48e092cd 100755
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -32,6 +32,7 @@ declare_args() {
   GIT_REVISION = ""
   MAST = 0
   ASAN = 0
+  ONLY_C = 0
 }
 
 # Define global args
diff --git a/src/mapleall/maple_me/src/irmap.cpp b/src/mapleall/maple_me/src/irmap.cpp
index cdc39cd369d5eda47bf0f739a99aae51ca53dd71..73d16afe8bac7073c158db23ef3ff6df4104384f 100644
--- a/src/mapleall/maple_me/src/irmap.cpp
+++ b/src/mapleall/maple_me/src/irmap.cpp
@@ -19,6 +19,8 @@
 #include "constantfold.h"
 #include "cast_opt.h"
 
+#include <optional>
+
 namespace maple {
 void IRMap::UpdateIncDecAttr(MeStmt &meStmt) {
   if (!kOpcodeInfo.AssignActualVar(meStmt.GetOp())) {
diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh
index a8672855b9e1285a4513f70c93d5b64dd72e92ab..42d3d70a1fe67b3898451a6ee199963c993dc92b 100755
--- a/tools/setup_tools.sh
+++ b/tools/setup_tools.sh
@@ -149,12 +149,12 @@ if [ ! -f $TOOLS/qemu/usr/bin/qemu-aarch64 ]; then
   rm -rf qemu
   mkdir -p qemu
   if [ "$OLD_OS" == "1" ];then
-    wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb --no-check-certificate
-    dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb qemu
+    wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.39_amd64.deb --no-check-certificate
+    dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.39_amd64.deb qemu
   else
     # we will use QEMU 2.11 for now, and will upgrade it to a new version after further investigations
-    wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb --no-check-certificate
-    dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb qemu
+    wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.39_amd64.deb --no-check-certificate
+    dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.39_amd64.deb qemu
   fi
   echo Installed qemu-aarch64
 fi