diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..5135af0e4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.exe filter=lfs diff=lfs merge=lfs -text
diff --git a/HMCL/src/main/resources/assets/HMCLauncher.exe b/HMCL/src/main/resources/assets/HMCLauncher.exe
index 9a6ece8e2..fc1fe81dc 100644
Binary files a/HMCL/src/main/resources/assets/HMCLauncher.exe and b/HMCL/src/main/resources/assets/HMCLauncher.exe differ
diff --git a/HMCLauncher/HMCL/HMCL.vcxproj b/HMCLauncher/HMCL/HMCL.vcxproj
index 4434f09ba..c1bb2d2cd 100644
--- a/HMCLauncher/HMCL/HMCL.vcxproj
+++ b/HMCLauncher/HMCL/HMCL.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{672B1019-E741-4C0D-A986-627E2ACE157B}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>HMCL</RootNamespace>
-    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
     <ProjectName>HMCLauncher</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -49,7 +49,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/HMCLauncher/HMCL/java.cpp b/HMCLauncher/HMCL/java.cpp
index f4f9579d5..a0441c209 100644
--- a/HMCLauncher/HMCL/java.cpp
+++ b/HMCLauncher/HMCL/java.cpp
@@ -9,7 +9,7 @@ const LPCWSTR JRE_OLD = L"SOFTWARE\\JavaSoft\\Java Runtime Environment";
 const LPCWSTR JDK_NEW = L"SOFTWARE\\JavaSoft\\JDK";
 const LPCWSTR JRE_NEW = L"SOFTWARE\\JavaSoft\\JRE";
 
-bool oldJavaFound = false, newJavaFound = false;
+bool oldJavaFound = false;
 
 bool FindJavaByRegistryKey(HKEY rootKey, LPCWSTR subKey, std::wstring & path)
 {
@@ -58,8 +58,6 @@ bool FindJavaByRegistryKey(HKEY rootKey, LPCWSTR subKey, std::wstring & path)
 		{
 			if (Version(javaVer) < JAVA_8)
 				oldJavaFound = true;
-			else if (JAVA_11 <= Version(javaVer))
-				newJavaFound = true;
 			else
 				flag = true;
 		}
diff --git a/HMCLauncher/HMCL/main.cpp b/HMCLauncher/HMCL/main.cpp
index f7ba721c8..c51747685 100644
--- a/HMCLauncher/HMCL/main.cpp
+++ b/HMCLauncher/HMCL/main.cpp
@@ -6,7 +6,7 @@
 
 using namespace std;
 
-Version J8(TEXT("8")), J11(TEXT("11"));
+Version J8(TEXT("8"));
 
 void RawLaunchJVM(const wstring &javaPath, const wstring &jarPath)
 {
@@ -20,7 +20,7 @@ void LaunchJVM(const wstring &javaPath, const wstring &jarPath)
 	if (!MyGetFileVersionInfo(javaPath, javaVersion))
 		return;
 
-	if (J8 <= javaVersion && javaVersion < J11)
+	if (J8 <= javaVersion)
 	{
 		RawLaunchJVM(javaPath, jarPath);
 	}
diff --git a/HMCLauncher/HMCL/os.cpp b/HMCLauncher/HMCL/os.cpp
index b86d2108a..17c0c3bc9 100644
--- a/HMCLauncher/HMCL/os.cpp
+++ b/HMCLauncher/HMCL/os.cpp
@@ -77,7 +77,7 @@ bool FindFirstFileExists(LPCWSTR lpPath, DWORD dwFilter)
 bool GetArch(bool & is64Bit)
 {
 #if _WIN64
-	isWindows64bit = true;
+	is64Bit = true;
 	return true;
 #elif _WIN32
 	typedef BOOL(WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);