diff --git a/data/fighters/rocketTurret.json b/data/fighters/rocketTurret.json
index 7e1d649..fc8329d 100644
--- a/data/fighters/rocketTurret.json
+++ b/data/fighters/rocketTurret.json
@@ -13,6 +13,6 @@
 			"y" : 0
 		}
 	],
-	"flags" : "EF_STATIC+EF_TAKES_DAMAGE",
+	"flags" : "EF_TAKES_DAMAGE",
 	"aiFlags" : "AIF_MISSILE_BOAT+AIF_AGGRESSIVE+AIF_INSTANT_DIE+AIF_LONG_RANGE_FIRE"
 }
diff --git a/src/battle/ai.c b/src/battle/ai.c
index a5484e5..0ff263a 100644
--- a/src/battle/ai.c
+++ b/src/battle/ai.c
@@ -84,7 +84,7 @@ void doAI(void)
 	
 	if (!(self->aiFlags & AIF_AVOIDS_COMBAT))
 	{
-		if (!(self->flags & EF_STATIC))
+		if (self->speed)
 		{
 			doFighterAI();
 		}
@@ -92,6 +92,7 @@ void doAI(void)
 		{
 			doGunAI();
 		}
+		
 		return;
 	}
 	
diff --git a/src/battle/entities.c b/src/battle/entities.c
index 79015c5..4f781e3 100644
--- a/src/battle/entities.c
+++ b/src/battle/entities.c
@@ -110,7 +110,7 @@ void doEntities(void)
 				
 				restrictToGrid(e);
 				
-				if (e->flags & EF_STATIC)
+				if (!e->speed)
 				{
 					e->dx = e->dy = 0;
 				}
@@ -283,7 +283,7 @@ static void alignComponents(void)
 			e->x = x;
 			e->y = y;
 			
-			if (e->type == ET_CAPITAL_SHIP_COMPONENT || e->type == ET_CAPITAL_SHIP_ENGINE)
+			if (e->flags & EF_STATIC)
 			{
 				e->angle = e->owner->angle;
 			}
diff --git a/src/battle/extractionPoint.c b/src/battle/extractionPoint.c
index 81c9467..9fb24e2 100644
--- a/src/battle/extractionPoint.c
+++ b/src/battle/extractionPoint.c
@@ -32,7 +32,6 @@ Entity *spawnExtractionPoint(void)
 	extractionPoint->texture = getTexture("gfx/entities/extractionPoint.png");
 	extractionPoint->action = think;
 	extractionPoint->flags |= EF_NO_MT_BOX;
-	extractionPoint->flags |= EF_STATIC;
 	
 	return extractionPoint;
 }
diff --git a/src/battle/waypoints.c b/src/battle/waypoints.c
index de6413f..c8caff5 100644
--- a/src/battle/waypoints.c
+++ b/src/battle/waypoints.c
@@ -44,7 +44,6 @@ Entity *spawnWaypoint(void)
 	waypoint->flags = EF_MISSION_TARGET;
 	waypoint->action = think;
 	waypoint->flags |= EF_NO_MT_BOX;
-	waypoint->flags |= EF_STATIC;
 	
 	return waypoint;
 }