diff --git a/src/gs-entbase/server/func_train.qc b/src/gs-entbase/server/func_train.qc
index c6db9c23..bddd7074 100644
--- a/src/gs-entbase/server/func_train.qc
+++ b/src/gs-entbase/server/func_train.qc
@@ -102,6 +102,7 @@ func_train::Save(float handle)
 	SaveFloat(handle, "m_flWait", m_flWait);
 	SaveFloat(handle, "m_flSpeed", m_flSpeed);
 	SaveFloat(handle, "m_flDamage", m_flDamage);
+	SaveFloat(handle, "m_flCurrentSpeed", m_flCurrentSpeed);
 	SaveString(handle, "m_strMoveSnd", m_strMoveSnd);
 	SaveString(handle, "m_strStopSnd", m_strStopSnd);
 }
@@ -119,6 +120,9 @@ func_train::Restore(string strKey, string strValue)
 	case "m_flDamage":
 		m_flDamage = ReadFloat(strValue);
 		break;
+	case "m_flCurrentSpeed":
+		m_flCurrentSpeed = ReadFloat(strValue);
+		break;
 	case "m_strMoveSnd":
 		m_strMoveSnd = ReadString(strValue);
 		break;
diff --git a/src/gs-entbase/server/monstermaker.qc b/src/gs-entbase/server/monstermaker.qc
index d4280a16..26693a01 100644
--- a/src/gs-entbase/server/monstermaker.qc
+++ b/src/gs-entbase/server/monstermaker.qc
@@ -217,6 +217,7 @@ monstermaker::Spawner(void)
 	unit.m_oldOrigin = GetOrigin();
 	unit.m_oldAngle = GetAngles();
 	unit.targetname = m_strChildName;
+	unit.ReleaseThink();
 
 	m_iMonsterSpawned++;
 
diff --git a/src/shared/NSMoverEntity.qc b/src/shared/NSMoverEntity.qc
index 24b78d05..17f761c0 100644
--- a/src/shared/NSMoverEntity.qc
+++ b/src/shared/NSMoverEntity.qc
@@ -203,9 +203,6 @@ NSMoverEntity::GetMoverRotation2(void)
 void
 NSMoverEntity::MoveToPosition(vector vecDest, float flSpeed)
 {
-	if (vecDest == origin)
-		return;
-
 	MoveAndRotateToPosition(vecDest, GetAngles(), flSpeed);
 }