diff --git a/custom/4coder_base_types.h b/custom/4coder_base_types.h
index 3ca3f926..5d309777 100644
--- a/custom/4coder_base_types.h
+++ b/custom/4coder_base_types.h
@@ -268,8 +268,6 @@ enum{
 
 #define Max(a,b) (((a)>(b))?(a):(b))
 #define Min(a,b) (((a)<(b))?(a):(b))
-#define max(a,b) (((a)>(b))?(a):(b))
-#define min(a,b) (((a)<(b))?(a):(b))
 #define clamp_top(a,b) Min(a,b)
 #define clamp_bot(a,b) Max(a,b)
 #define clamp_(a,x,b) ((a>x)?a:((b<x)?b:x))
diff --git a/custom/4coder_types.h b/custom/4coder_types.h
index f432316f..cf2549f7 100644
--- a/custom/4coder_types.h
+++ b/custom/4coder_types.h
@@ -707,6 +707,7 @@ struct Layout_Item{
     u32 codepoint;
     Layout_Item_Flag flags;
     Rect_f32 rect;
+    f32 padded_y1;
 };
 
 api(custom)
diff --git a/custom/bin/setup_cl_generic.bat b/custom/bin/setup_cl_generic.bat
index 50246ce1..84508da2 100644
--- a/custom/bin/setup_cl_generic.bat
+++ b/custom/bin/setup_cl_generic.bat
@@ -22,3 +22,10 @@ IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcv
 
 SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional
 IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %1))
+
+SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community
+IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %1))
+
+SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional
+IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %1))
+