diff --git a/4cpp/4cpp_lexer.h b/4cpp/4cpp_lexer.h
index 9dfdb6c3..f98bcebf 100644
--- a/4cpp/4cpp_lexer.h
+++ b/4cpp/4cpp_lexer.h
@@ -78,7 +78,7 @@ DOC_RETURN(Returns the memory size, in bytes, needed to allocate a table for the
         memsize += 8 + (len+3)&(~3);
     }
     u32_4tech table_count = (str_count * 3) / 2;
-    memsize += table_count*sizeof(void*);
+    memsize += table_count*sizeof(u64_4tech);
     return(memsize);
 }
 
@@ -97,7 +97,7 @@ DOC_RETURN(Returns the memory size, in bytes, needed to allocate a table for the
         memsize += 8 + (len+3)&(~3);
     }
     u32_4tech table_count = (str_count * 3)/2;
-    memsize += table_count*sizeof(void*);
+    memsize += table_count*sizeof(u64_4tech);
     return(memsize);
 }
 
diff --git a/buildsuper.bat b/buildsuper.bat
index 9de56f3d..cccba714 100644
--- a/buildsuper.bat
+++ b/buildsuper.bat
@@ -6,7 +6,7 @@ REM default files no matter where you store your code.
 REM And no matter how you call buildsuper.bat.
 SET CODE_HOME=%~dp0
 
-IF NOT "%Platform%" == "X64" (call "%CODE_HOME%\\build_scripts\\setup_cl_x64.bat")
+IF NOT "%Platform%" == "X64" (call "%CODE_HOME%\\windows_scripts\\setup_cl_x64.bat")
 
 SET SRC=%1
 if "%SRC%" == "" SET SRC=4coder_default_bindings.cpp
diff --git a/buildsuper_x86.bat b/buildsuper_x86.bat
index 0094d012..1e8ecd09 100644
--- a/buildsuper_x86.bat
+++ b/buildsuper_x86.bat
@@ -6,7 +6,7 @@ REM default files no matter where you store your code.
 REM And no matter how you call buildsuper.bat.
 SET CODE_HOME=%~dp0
 
-IF NOT "%Platform%" == "X86" (call "%CODE_HOME%\\build_scripts\\setup_cl_x86.bat")
+IF NOT "%Platform%" == "X86" (call "%CODE_HOME%\\windows_scripts\\setup_cl_x86.bat")
 
 SET SRC=%1
 if "%SRC%" == "" (SET SRC=4coder_default_bindings.cpp)