diff --git a/src/dobjgc.cpp b/src/dobjgc.cpp
index 59e0990063..05cc73aedc 100644
--- a/src/dobjgc.cpp
+++ b/src/dobjgc.cpp
@@ -365,6 +365,10 @@ static void MarkRoot()
 	}
 	// Mark types
 	TypeTable.Mark();
+	for (unsigned int i = 0; i < PClass::AllClasses.Size(); ++i)
+	{
+		Mark(PClass::AllClasses[i]);
+	}
 	// Mark bot stuff.
 	Mark(bglobal.firstthing);
 	Mark(bglobal.body1);
diff --git a/src/thingdef/thingdef_expression.cpp b/src/thingdef/thingdef_expression.cpp
index d1c225e900..2ebea2a468 100644
--- a/src/thingdef/thingdef_expression.cpp
+++ b/src/thingdef/thingdef_expression.cpp
@@ -3964,7 +3964,6 @@ static int DoFindState(VMFrameStack *stack, VMValue *param, int numparam, VMRetu
 	}
 	ret->SetPointer(state, ATAG_STATE);
 	return 1;
-
 }
 
 // Find a state with any number of dots in its name.