diff --git a/src/g_strife/a_strifeweapons.cpp b/src/g_strife/a_strifeweapons.cpp
index f81ca79f7..0a753e961 100644
--- a/src/g_strife/a_strifeweapons.cpp
+++ b/src/g_strife/a_strifeweapons.cpp
@@ -552,7 +552,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_MaulerTorpedoWave)
 
 	// If the torpedo hit the ceiling, it should still spawn the wave
 	savedz = self->Z();
-	if (wavedef && self->ceilingz < wavedef->Top())
+	if (wavedef && self->ceilingz < self->Z() + wavedef->height)
 	{
 		self->SetZ(self->ceilingz - wavedef->Height);
 	}
diff --git a/src/thingdef/thingdef_exp.cpp b/src/thingdef/thingdef_exp.cpp
index 991e9b947..cad6198f0 100644
--- a/src/thingdef/thingdef_exp.cpp
+++ b/src/thingdef/thingdef_exp.cpp
@@ -309,7 +309,8 @@ static FxExpression *ParseExpressionC (FScanner &sc, PClassActor *cls)
 static FxExpression *ParseExpressionB (FScanner &sc, PClassActor *cls)
 {
 	sc.GetToken();
-	switch(sc.TokenType)
+	int token = sc.TokenType;
+	switch(token)
 	{
 	case '~':
 		return new FxUnaryNotBitwise(ParseExpressionA (sc, cls));
@@ -325,7 +326,7 @@ static FxExpression *ParseExpressionB (FScanner &sc, PClassActor *cls)
 
 	case TK_Incr:
 	case TK_Decr:
-		return new FxPreIncrDecr(ParseExpressionA(sc, cls), sc.TokenType);
+		return new FxPreIncrDecr(ParseExpressionA(sc, cls), token);
 
 	default:
 		sc.UnGet();