diff --git a/src/simulation/Element.h b/src/simulation/Element.h
index d9c79030c..3c28e2f9c 100644
--- a/src/simulation/Element.h
+++ b/src/simulation/Element.h
@@ -8,9 +8,6 @@
 #include "Gravity.h"
 #include "Misc.h"
 #include "ElementGraphics.h"
-#ifdef _MSC_VER
-#include <Windows.h>
-#endif
 
 #define IPL -257.0f
 #define IPH 257.0f
diff --git a/src/simulation/elements/FIRE.cpp b/src/simulation/elements/FIRE.cpp
index f9313fa97..538bd05ab 100644
--- a/src/simulation/elements/FIRE.cpp
+++ b/src/simulation/elements/FIRE.cpp
@@ -96,6 +96,12 @@ int Element_FIRE::update(UPDATE_FUNC_ARGS)
 				    (rt!=PT_SPNG || parts[r>>8].life==0) &&
 				    sim->elements[rt].Flammable && (sim->elements[rt].Flammable + (int)(sim->pv[(y+ry)/CELL][(x+rx)/CELL]*10.0f))>(rand()%1000))
 				{
+					int j = sim->create_part(-1, x-1+rand()%3, y-1+rand()%3, PT_SMKE);
+					if (j != -1)
+					{
+						parts[r>>8].temp = restrict_flt(sim->elements[PT_FIRE].Temperature + (sim->elements[rt].Flammable/2), MIN_TEMP, MAX_TEMP);
+						parts[j].life = rand()%80+480;
+					}
 					sim->part_change_type(r>>8,x+rx,y+ry,PT_FIRE);
 					parts[r>>8].temp = restrict_flt(sim->elements[PT_FIRE].Temperature + (sim->elements[rt].Flammable/2), MIN_TEMP, MAX_TEMP);
 					parts[r>>8].life = rand()%80+180;
diff --git a/src/simulation/elements/FWRK.cpp b/src/simulation/elements/FWRK.cpp
index 6889f91df..f05db69dd 100644
--- a/src/simulation/elements/FWRK.cpp
+++ b/src/simulation/elements/FWRK.cpp
@@ -61,7 +61,7 @@ int Element_FWRK::update(UPDATE_FUNC_ARGS)
 			gx += sinf(angle)*sim->elements[PT_FWRK].Gravity*0.5f;
 			gy += cosf(angle)*sim->elements[PT_FWRK].Gravity*0.5f;
 		}
-		gmax = fmaxf(fabsf(gx), fabsf(gy));
+		gmax = std::max(fabsf(gx), fabsf(gy));
 		if (sim->eval_move(PT_FWRK, (int)(x-(gx/gmax)+0.5f), (int)(y-(gy/gmax)+0.5f), NULL))
 		{
 			multiplier = 15.0f/sqrtf(gx*gx+gy*gy);
diff --git a/src/simulation/elements/PLNT.cpp b/src/simulation/elements/PLNT.cpp
index 84a83c25f..e7439d183 100644
--- a/src/simulation/elements/PLNT.cpp
+++ b/src/simulation/elements/PLNT.cpp
@@ -107,7 +107,7 @@ int Element_PLNT::update(UPDATE_FUNC_ARGS)
 //#TPT-Directive ElementHeader Element_PLNT static int graphics(GRAPHICS_FUNC_ARGS)
 int Element_PLNT::graphics(GRAPHICS_FUNC_ARGS)
 {
-	float maxtemp = fmax(cpart->tmp2, cpart->temp);
+	float maxtemp = std::max((float)cpart->tmp2, cpart->temp);
 	if (maxtemp > 300)
 	{
 		*colr += (int)restrict_flt((maxtemp-300)/5,0,58);
diff --git a/src/simulation/elements/WOOD.cpp b/src/simulation/elements/WOOD.cpp
index cbbab8f90..134d827ed 100644
--- a/src/simulation/elements/WOOD.cpp
+++ b/src/simulation/elements/WOOD.cpp
@@ -49,7 +49,7 @@ Element_WOOD::Element_WOOD()
 //#TPT-Directive ElementHeader Element_WOOD static int graphics(GRAPHICS_FUNC_ARGS)
 int Element_WOOD::graphics(GRAPHICS_FUNC_ARGS)
 {
-	float maxtemp = fmax(cpart->tmp, cpart->temp);
+	float maxtemp = std::max((float)cpart->tmp, cpart->temp);
 	if (maxtemp > 400)
 	{
 		*colr -= (int)restrict_flt((maxtemp-400)/3,0,172);