diff --git a/uppsrc/ide/InstantSetup.cpp b/uppsrc/ide/InstantSetup.cpp
index 240d6fc8b..9f789e3f4 100644
--- a/uppsrc/ide/InstantSetup.cpp
+++ b/uppsrc/ide/InstantSetup.cpp
@@ -264,24 +264,22 @@ void InstantSetup()
 				bins.At(0) = vc + (ver17 ? (x64 ? "/bin/hostx64/x64" : "/bin/hostx86/x86") : (x64 ? "/bin/amd64" : "/bin"));
 				bins.At(1) = bin + (x64 ? "/x64" : "/x86");
 
-				String& sslbin = bins.At(2);
-				if(IsNull(sslbin) || ToLower(sslbin).Find("openssl") >= 0)
-					sslbin = GetExeDirFile(x64 ? "bin/openssl/bin64" : "bin/openssl/bin");
+				int ii = 2;
 
-				String& sdlbin = bins.At(3);
+				String& sdlbin = bins.At(ii++);
 				if(IsNull(sdlbin) || ToLower(sdlbin).Find("sdl2") >= 0)
 					sdlbin = GetExeDirFile(x64 ? "bin/SDL2/lib/x64" : "bin/SDL2/lib/x86");
 				
-				String& pgbin = bins.At(4);
+				String& pgbin = bins.At(ii++);
 				if(IsNull(pgbin) || ToLower(pgbin).Find("pgsql") >= 0)
 					pgbin = GetExeDirFile(x64 ? "bin/pgsql/x64/bin" : "bin/pgsql/x86/bin");
 
-				String& mybin = bins.At(5);
+				String& mybin = bins.At(ii++);
 				if(IsNull(mybin) || ToLower(mybin).Find("pgsql") >= 0)
 					mybin = GetExeDirFile(x64 ? "bin/mysql/lib64" : "bin/mysql/lib32");
 				
 				incs.At(0) = vc + "/include";
-				int ii = 1;
+				ii = 1;
 				if(inc.GetCount()) {
 					incs.At(ii++) = inc + "/um";
 					incs.At(ii++) = inc + "/ucrt";
@@ -293,19 +291,19 @@ void InstantSetup()
 					incs.At(ii++) = kit81 + "/include/shared";
 				}
 	
-				String& sslinc = incs.At(4);
+				String& sslinc = incs.At(ii++);
 				if(IsNull(sslinc) || ToLower(sslinc).Find("openssl") >= 0)
 					sslinc = GetExeDirFile("bin/openssl/include");
 
-				String& sdlinc = incs.At(5);
+				String& sdlinc = incs.At(ii++);
 				if(IsNull(sdlinc) || ToLower(sdlinc).Find("sdl2") >= 0)
 					sdlinc = GetExeDirFile("bin/SDL2/include");
 
-				String& pginc = incs.At(6);
+				String& pginc = incs.At(ii++);
 				if(IsNull(pginc) || ToLower(pginc).Find("pgsql") >= 0)
 					pginc = GetExeDirFile(x64 ? "bin/pgsql/x64/include" : "bin/pgsql/x86/include");
 
-				String& myinc = incs.At(7);
+				String& myinc = incs.At(ii++);
 				if(IsNull(myinc) || ToLower(myinc).Find("mysql") >= 0)
 					myinc = GetExeDirFile(x64 ? "bin/mysql/include" : "bin/mysql/include");