diff --git a/polymer/build/src/defs.c b/polymer/build/src/defs.c
index a3fdf4bd7..7abf06a06 100644
--- a/polymer/build/src/defs.c
+++ b/polymer/build/src/defs.c
@@ -288,6 +288,7 @@ static int defsparser(scriptfile *script)
     char *cmdtokptr;
     while (1)
     {
+        if (quitevent) return 0;
         tokn = getatoken(script,basetokens,sizeof(basetokens)/sizeof(tokenlist));
         cmdtokptr = script->ltextptr;
         switch (tokn)
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 0105a605e..074eca6ba 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -156,11 +156,9 @@ int kopen4loadfrommod(char *filename, char searchfirst)
     static char fn[BMAX_PATH];
     int r;
 
-    Bstrcpy(fn,mod_dir);
-    Bstrcat(fn,"/");
-    Bstrcat(fn,filename);
+    Bsprintf(fn,"%s/%s",mod_dir,filename);
     r = kopen4load(fn,searchfirst);
-    if (r == -1)
+    if (r < 0)
         r = kopen4load(filename,searchfirst);
     return r;
 }