diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index ded1b4baa..7c8a710cc 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -149,6 +149,8 @@ LUAJIT=luajit
 LUAJIT_WIN_SRC:= g:/mod/LuaJIT-2.0.0-beta8/src
 
 ifneq (0,$(LUNATIC))
+    # TODO: pass these flags only when building EDuke32, not Mapster32
+
     ifeq ($(PLATFORM),WINDOWS)
         OURCFLAGS+= -I$(LUAJIT_WIN_SRC)
     else
diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/polymer/eduke32/source/lunatic/defs.ilua
index 282ed66ea..461aae704 100644
--- a/polymer/eduke32/source/lunatic/defs.ilua
+++ b/polymer/eduke32/source/lunatic/defs.ilua
@@ -720,7 +720,7 @@ G_.tonumber = tonumber
 --rawget
 G_.xpcall = xpcall
 G_.ipairs = ipairs
-G_.print = print
+G_.print = print  -- TODO: --> initprintf or OSD_Printf; why not needed on linux?
 G_.pcall = pcall
 --gcinfo --DEPRECATED
 --module
diff --git a/polymer/eduke32/source/lunatic/lunacon.lua b/polymer/eduke32/source/lunatic/lunacon.lua
index ca367c411..6d3961e43 100644
--- a/polymer/eduke32/source/lunatic/lunacon.lua
+++ b/polymer/eduke32/source/lunatic/lunacon.lua
@@ -124,7 +124,7 @@ end
 local function parse_number(pos, numstr)
     local num = tonumber(numstr)
 
-    if (num < -0x80000000 or num > 0xffffffff) then
+    if (num==nil or num < -0x80000000 or num > 0xffffffff) then
         perrprintf(pos, "number %s out of the range of a 32-bit integer", numstr)
         num = NaN
     elseif (num >= 0x80000000 and numstr:sub(1,2):lower()~="0x") then