diff --git a/game/engines/default/engine/Entity.lua b/game/engines/default/engine/Entity.lua
index 55e960f0d3f6bfa4b87643474eb5b16fbfa5a630..4c9f52223d78e6504904cdb092dd784fcf61c78c 100644
--- a/game/engines/default/engine/Entity.lua
+++ b/game/engines/default/engine/Entity.lua
@@ -593,6 +593,7 @@ end
 function _M:MOflipX(v)
 	if not self._mo then return end
 	self._mo:flipX(v)
+	self._flipx = v
 
 	if not self.add_displays then return end
 
@@ -608,6 +609,7 @@ end
 function _M:MOflipY(v)
 	if not self._mo then return end
 	self._mo:flipY(v)
+	self._flipy = v
 
 	if not self.add_displays then return end
 
diff --git a/game/engines/default/engine/Particles.lua b/game/engines/default/engine/Particles.lua
index 8808b320f603fc44181c21ec2250a41556595c0b..ce5cb1a7361090509fb7ececd76264d0f5a15552 100644
--- a/game/engines/default/engine/Particles.lua
+++ b/game/engines/default/engine/Particles.lua
@@ -29,7 +29,7 @@ setmetatable(__particles_gl, {__mode="v"})
 
 --- Make a particle emitter
 function _M:init(def, radius, args, shader)
-	self.args = args
+	self.args = args or {}
 	self.def = def
 	self.radius = radius or 1
 	self.shader = shader