diff --git a/Makefile b/Makefile
index 8ec07ed..9895cd4 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION)
 SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
 SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
 # Change this variable to use a specific git commit
-SNAPPY_GIT_REV:=00aa9ac61d37194cffb0913d9b7d71611eb05a4b # $(SNAPPY_VERSION)
+SNAPPY_GIT_REV:=$(SNAPPY_VERSION)
 SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log
 SNAPPY_GIT_UNPACKED:=$(TARGET)/snappy-git-extracted.log
 SNAPPY_CMAKE_CACHE=$(SNAPPY_OUT)/CMakeCache.txt
diff --git a/Makefile.common b/Makefile.common
index ecbc963..043883a 100755
--- a/Makefile.common
+++ b/Makefile.common
@@ -295,14 +295,14 @@ Windows-x86_64_LINKFLAGS    := -Wl,--kill-at -shared -static
 Windows-x86_64_LIBNAME      := snappyjava.dll
 Windows-x86_64_SNAPPY_FLAGS :=
 
-Windows-armv7_CXX          := ${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++
+Windows-armv7_CXX          := ${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++
 Windows-armv7_STRIP        := ${CROSS_ROOT}/bin/${CROSS_TRIPLE}-strip
 Windows-armv7_CXXFLAGS     := -Ilib/inc_win -O2 -std=c++11
 Windows-armv7_LINKFLAGS    := -Wl,--kill-at -shared -static
 Windows-armv7_LIBNAME      := snappyjava.dll
 Windows-armv7_SNAPPY_FLAGS :=
 
-Windows-aarch64_CXX          := ${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++
+Windows-aarch64_CXX          := ${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++
 Windows-aarch64_STRIP        := ${CROSS_ROOT}/bin/${CROSS_TRIPLE}-strip
 Windows-aarch64_CXXFLAGS     := -Ilib/inc_win -O2 -std=c++11
 Windows-aarch64_LINKFLAGS    := -Wl,--kill-at -shared -static