diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 47773c12728223de7014524a8061b17ff8d020bb..9360f818d1e6c7a9f8bb23a81eca138401ab1e2d 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -2753,7 +2753,7 @@ function _M:die(src, death_note)
 	-- Self resurrect, mouhaha!
 	if self:attr("self_resurrect") then
 		self:attr("self_resurrect", -1)
-		game.logSeen(self, "#LIGHT_RED#%s rises from the dead!", self.name:capitalize()) -- src, not self as the source, to make sure the player knows his doom ;>
+		game.logSeen(self, self.self_resurrect_msg or "#LIGHT_RED#%s rises from the dead!", self.name:capitalize()) -- src, not self as the source, to make sure the player knows his doom ;>
 		local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
 		game.flyers:add(sx, sy, 30, (rng.range(0,2)-1) * 0.5, -3, "RESURRECT!", {255,120,0})
 
@@ -2770,7 +2770,6 @@ function _M:die(src, death_note)
 		self.dead = false
 		self.died = (self.died or 0) + 1
 		self:move(self.x, self.y, true)
-
 		self:check("on_resurrect", "basic_resurrect")
 
 		if self:attr("self_resurrect_chat") then
@@ -5637,6 +5636,7 @@ function _M:effectsFilter(t, nb)
 end
 
 function _M:removeEffectsFilter(t, nb, silent, force, check_remove)
+	t = t or {}
 	local eff_ids = self:effectsFilter(t, nb)
 	for _, eff_id in ipairs(eff_ids) do
 		if not check_remove or check_remove(self, eff_id) then
@@ -5671,6 +5671,7 @@ function _M:sustainsFilter(t, nb)
 end
 
 function _M:removeSustainsFilter(t, nb, check_remove)
+	t = t or {}
 	local found = self:sustainsFilter(t, nb)
 	for _, tid in ipairs(found) do
 		if not check_remove or check_remove(self, tid) then
@@ -5681,6 +5682,7 @@ function _M:removeSustainsFilter(t, nb, check_remove)
 end
 
 function _M:removeEffectsSustainsFilter(t, nb, check_remove)
+	t = t or {}
 	local objects = {}
 	for _, eff_id in ipairs(self:effectsFilter(t)) do
 		objects[#objects + 1] = {"effect", eff_id}
diff --git a/src/particles.c b/src/particles.c
index 711a941fa8a5beb3275d6435d22b764dcb739804..5e42b9fc0f09e0fc88a366ec554764a883a737c3 100644
--- a/src/particles.c
+++ b/src/particles.c
@@ -433,10 +433,10 @@ static void particles_draw(particles_type *ps, float x, float y, float zoom)
 	else if (ps->blend_mode == BLEND_MIXED) glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
 	if (multitexture_active) tglActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, ps->texture);
+	tglBindTexture(GL_TEXTURE_2D, ps->texture);
 	if (multitexture_active && main_fbo) {
 		tglActiveTexture(GL_TEXTURE1);
-		glBindTexture(GL_TEXTURE_2D, main_fbo->texture);
+		tglBindTexture(GL_TEXTURE_2D, main_fbo->texture);
 	}
 	glTexCoordPointer(2, GL_SHORT, 0, texcoords);
 	glColorPointer(4, GL_FLOAT, 0, colors);