diff --git a/common/waifu2x.cpp b/common/waifu2x.cpp
index 75955cb..093ce5c 100644
--- a/common/waifu2x.cpp
+++ b/common/waifu2x.cpp
@@ -41,12 +41,14 @@
 #pragma comment(lib, "opencv_core" CV_VERSION_STR CV_EXT_STR)
 #pragma comment(lib, "opencv_imgcodecs" CV_VERSION_STR CV_EXT_STR)
 #pragma comment(lib, "opencv_imgproc" CV_VERSION_STR CV_EXT_STR)
-//#pragma comment(lib, "IlmImf" CV_EXT_STR)
-//#pragma comment(lib, "libjasper" CV_EXT_STR)
-//#pragma comment(lib, "libjpeg" CV_EXT_STR)
-//#pragma comment(lib, "libpng" CV_EXT_STR)
-//#pragma comment(lib, "libtiff" CV_EXT_STR)
-//#pragma comment(lib, "libwebp" CV_EXT_STR)
+#pragma comment(lib, "IlmImf" CV_EXT_STR)
+#pragma comment(lib, "ippicvmt.lib")
+#pragma comment(lib, "libjasper" CV_EXT_STR)
+#pragma comment(lib, "libjpeg-turbo" CV_EXT_STR)
+#pragma comment(lib, "libpng" CV_EXT_STR)
+#pragma comment(lib, "libtiff" CV_EXT_STR)
+#pragma comment(lib, "libwebp" CV_EXT_STR)
+#pragma comment(lib, "zlib" CV_EXT_STR)
 
 #pragma comment(lib, "libopenblas.dll.a")
 #pragma comment(lib, "cudart.lib")
@@ -56,32 +58,27 @@
 
 #ifdef _DEBUG
 #pragma comment(lib, "caffe-d.lib")
-#pragma comment(lib, "proto-d.lib")
-#pragma comment(lib, "libboost_system-vc120-mt-gd-1_59.lib")
-#pragma comment(lib, "libboost_thread-vc120-mt-gd-1_59.lib")
-#pragma comment(lib, "libboost_filesystem-vc120-mt-gd-1_59.lib")
+#pragma comment(lib, "caffeproto-d.lib")
+#pragma comment(lib, "libprotobufd.lib")
 #pragma comment(lib, "glogd.lib")
 #pragma comment(lib, "gflagsd.lib")
-#pragma comment(lib, "libprotobufd.lib")
-#pragma comment(lib, "libhdf5_hl_D.lib")
-#pragma comment(lib, "libhdf5_D.lib")
-#pragma comment(lib, "zlibstaticd.lib")
+#pragma comment(lib, "libboost_system-vc140-mt-gd-1_61.lib")
+#pragma comment(lib, "boost_thread-vc140-mt-gd-1_61.lib")
+#pragma comment(lib, "boost_filesystem-vc140-mt-gd-1_61.lib")
+#pragma comment(lib, "boost_iostreams-vc140-mt-gd-1_61.lib")
+//#pragma comment(lib, "zlibstaticd.lib")
+
 
-#pragma comment(lib, "libboost_iostreams-vc120-mt-gd-1_59.lib")
 #else
 #pragma comment(lib, "caffe.lib")
-#pragma comment(lib, "proto.lib")
-#pragma comment(lib, "libboost_system-vc120-mt-1_59.lib")
-#pragma comment(lib, "libboost_thread-vc120-mt-1_59.lib")
-#pragma comment(lib, "libboost_filesystem-vc120-mt-1_59.lib")
+#pragma comment(lib, "caffeproto.lib")
+#pragma comment(lib, "libprotobuf.lib")
 #pragma comment(lib, "glog.lib")
 #pragma comment(lib, "gflags.lib")
-#pragma comment(lib, "libprotobuf.lib")
-#pragma comment(lib, "libhdf5_hl.lib")
-#pragma comment(lib, "libhdf5.lib")
-#pragma comment(lib, "zlibstatic.lib")
-
-#pragma comment(lib, "libboost_iostreams-vc120-mt-1_59.lib")
+#pragma comment(lib, "libboost_system-vc140-mt-1_61.lib")
+#pragma comment(lib, "boost_thread-vc140-mt-1_61.lib")
+#pragma comment(lib, "boost_filesystem-vc140-mt-1_61.lib")
+#pragma comment(lib, "boost_iostreams-vc140-mt-1_61.lib")
 #endif
 #endif
 
diff --git a/waifu2x-caffe-gui/LangStringList.h b/waifu2x-caffe-gui/LangStringList.h
index 890c434..add7ef5 100644
--- a/waifu2x-caffe-gui/LangStringList.h
+++ b/waifu2x-caffe-gui/LangStringList.h
@@ -94,7 +94,8 @@ private:
 		if (LangList.size() > 0)
 			return LangList[0];
 
-		return stLangSetting();
+		static stLangSetting empty;
+		return empty;
 	}
 
 	void ReadLangFile(const stLangSetting &lang, std::unordered_map<std::wstring, std::wstring> &langStringMap) const
diff --git a/waifu2x-caffe-gui/MainDialog.cpp b/waifu2x-caffe-gui/MainDialog.cpp
index 7104896..0f2e8b9 100644
--- a/waifu2x-caffe-gui/MainDialog.cpp
+++ b/waifu2x-caffe-gui/MainDialog.cpp
@@ -839,7 +839,7 @@ void DialogEvent::ProcessWaifu2x()
 
 			ret = w.waifu2x(p.first, p.second, ScaleRatio, ScaleWidth, ScaleHeight, [this]()
 			{
-				return cancelFlag;
+				return cancelFlag.load();
 			}, crop_size, crop_size, output_quality, output_depth, use_tta, batch_size);
 
 			num++;