diff --git a/SConstruct b/SConstruct
index 15402c38..7e580c13 100644
--- a/SConstruct
+++ b/SConstruct
@@ -143,7 +143,7 @@ if 'NSIS_CONFIG_CONST_DATA_PATH' in defenv['NSIS_CPPDEFINES']:
 else:
 	dirs = install_dirs['relocatable']
 
-if 'msvc' in defenv['TOOLS'] or 'mstoolkit' in defenv['TOOLS']:
+if defenv['PLATFORM'] == 'win32':
 	ignore_tests = 'none'
 else:
 	ignore_tests = ','.join(Split("""
diff --git a/Source/tokens.cpp b/Source/tokens.cpp
index 1b1cb580..e4e1260b 100644
--- a/Source/tokens.cpp
+++ b/Source/tokens.cpp
@@ -271,7 +271,7 @@ static tokenType tokenlist[TOK__LAST] =
 {TOK_P_IFNDEF,_T("!ifndef"),1,-1,_T("symbol [| symbol2 [& symbol3 [...]]]"),TP_ALL},
 {TOK_P_ENDIF,_T("!endif"),0,0,_T(""),TP_ALL},
 {TOK_P_DEFINE,_T("!define"),1,5,_T("[/ifndef | /redef] ([/date|/utcdate] symbol [value]) | (/file symbol filename) | (/math symbol val1 OP val2)\n    OP=(+ - * / % << >> >>> & | ^ ~ ! && ||)"),TP_ALL},
-{TOK_P_UNDEF,_T("!undef"),1,-1,_T("[/noerrors] symbol"),TP_ALL},
+{TOK_P_UNDEF,_T("!undef"),1,-1,_T("[/noerrors] symbol [...]"),TP_ALL},
 {TOK_P_ELSE,_T("!else"),0,-1,_T("[if[macro][n][def] ...]"),TP_ALL},
 {TOK_P_ECHO,_T("!echo"),1,0,_T("message"),TP_ALL},
 {TOK_P_WARNING,_T("!warning"),0,1,_T("[warning_message]"),TP_ALL},