diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 51a47dda0..cd1491b3e 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -2169,9 +2169,9 @@ void C_DefineSound(int32_t sndidx, const char *fn, int32_t args[5])
         snd->ps = args[0];
         snd->pe = args[1];
         snd->pr = args[2];
-        snd->m = args[3] & ~32;
-        if (args[3] & 1)
-            snd->m |= 32;
+        snd->m = args[3] & ~SF_ONEINST_INTERNAL;
+        if (args[3] & SF_LOOP)
+            snd->m |= SF_ONEINST_INTERNAL;
         snd->vo = args[4];
 
         if (sndidx > g_maxSoundPos)
diff --git a/polymer/eduke32/source/lunatic/util/colenemy.lua b/polymer/eduke32/source/lunatic/util/colenemy.lua
index ab7a1202d..730d38c1c 100644
--- a/polymer/eduke32/source/lunatic/util/colenemy.lua
+++ b/polymer/eduke32/source/lunatic/util/colenemy.lua
@@ -20,8 +20,10 @@ module(...)
 
 
 local ENEMY_NAME = {
+--[[
     [D.BOSS1] = "BOSS1",
     [D.BOSS1STAYPUT] = "BOSS1STAYPUT",
+--]]
     [D.BOSS2] = "BOSS2",
     [D.BOSS3] = "BOSS3",
     [D.BOSS4] = "BOSS4",
diff --git a/polymer/eduke32/source/lunatic/util/foreachmap.lua b/polymer/eduke32/source/lunatic/util/foreachmap.lua
index dff20ab74..7a4a7b7f5 100755
--- a/polymer/eduke32/source/lunatic/util/foreachmap.lua
+++ b/polymer/eduke32/source/lunatic/util/foreachmap.lua
@@ -27,6 +27,9 @@
 --  $ prog='if (map.version==9) then print(map.numbunches.." ".. math.max(unpack(map.sectsperbunch[0],0)) .." "..fn) end'
 --  $ ./findmaps.sh ~/.eduke32 "$prog" |sort -n -k 2
 
+-- Print all MUSICANDSFX sprites that play sounds with bit 1 set.
+-- ./findmaps.sh /g/Games/Eduke32c/grp 'sprite: .picnum==5 and eq(.lotag, {170, 186, 187, 279, 382, 347}) :: io. write(" ".. tostring(.lotag))'
+
 local B = require "build"
 local string = require "string"
 local io = require "io"
@@ -94,6 +97,11 @@ if (modname:sub(1,2) == "-e") then
     end
 
     local successfunc, errmsg = loadstring([[
+        local function eq(x, tab)
+            for i=1,#tab do
+                if (x==tab[i]) then return true end
+            end
+        end
         local d=require('build').readdefs('../../names.h') or error('Need ../../names.h')  -- XXX
         local numsectors, numwalls, numsprites, sector, wall, sprite
         return function (map, fn)