diff --git a/src/Edit.c b/src/Edit.c
index ff70f812b..cfdbcb995 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -2825,6 +2825,7 @@ void EditToggleLineComments(HWND hwnd,LPCWSTR pwszComment,BOOL bInsertAtStart)
 
   if ((SC_SEL_RECTANGLE != SciCall_GetSelectionMode()) && (cchComment > 0))
   {
+    int iCommentCol = 0;
     int iLineStart = SciCall_LineFromPosition(iSelStart);
     int iLineEnd   = SciCall_LineFromPosition(iSelEnd);
     
@@ -2834,9 +2835,9 @@ void EditToggleLineComments(HWND hwnd,LPCWSTR pwszComment,BOOL bInsertAtStart)
         --iLineEnd;
     }
 
-    int iCommentCol = 1024;
 
     if (!bInsertAtStart) {
+      iCommentCol = 1024;
       for (int iLine = iLineStart; iLine <= iLineEnd; iLine++) {
         
         int iLineEndPos = SciCall_GetLineEndPosition(iLine);
diff --git a/test/TestFileVersion.cmd b/test/TestFileVersion.cmd
index 58eebc4c8..8f1eec575 100644
--- a/test/TestFileVersion.cmd
+++ b/test/TestFileVersion.cmd
@@ -11,9 +11,14 @@ set NP3_BUILD_VER=%SCRIPT_DIR%..\Versions\build.txt
 set YY=00
 set MM=00
 set DD=00
+
 call :GETDATE
+set "LZ=%MM:~0,1%"
+if [%LZ%]==[0] set "MM=%MM:~1,1%"
+
 set BUILD=0
 call :GETBUILD "%~1"
+
 set VERSHOULD=3.%YY%.%MM%%DD%.%BUILD%
 
 :: --------------------------------------------------------------------------------------------------------------------
@@ -57,10 +62,11 @@ goto:EOF
 for /f "tokens=2 delims==" %%a in ('
     wmic OS Get localdatetime /value
 ') do set "dt=%%a"
-set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~5,1%" & set "DD=%dt:~6,2%"
+set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~4,2%" & set "DD=%dt:~6,2%"
 set "HH=%dt:~8,2%" & set "Min=%dt:~10,2%" & set "Sec=%dt:~12,2%"
 ::set "datestamp=%YYYY%%MM%%DD%" & set "timestamp=%HH%%Min%%Sec%"
 ::set "fullstamp=%YYYY%-%MM%-%DD%_%HH%-%Min%-%Sec%"
+::echo src: "%dt%"
 ::echo datestamp: "%datestamp%"
 ::echo timestamp: "%timestamp%"
 ::echo fullstamp: "%fullstamp%"