diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts
index 1a329642b..e536a5f3f 100644
--- a/src/core/configuration/DefaultConfig.ts
+++ b/src/core/configuration/DefaultConfig.ts
@@ -250,7 +250,7 @@ export class DefaultConfig implements Config {
         return {
           cost: () => 0,
           territoryBound: false,
-          damage: 250,
+          damage: 200,
         };
       case UnitType.SAMMissile:
         return {
@@ -706,7 +706,7 @@ export class DefaultConfig implements Config {
   }
 
   defensePostShellAttackRate(): number {
-    return 100;
+    return 120;
   }
 
   safeFromPiratesCooldownMax(): number {
diff --git a/src/core/execution/DefensePostExecution.ts b/src/core/execution/DefensePostExecution.ts
index aedebf26e..b3524e339 100644
--- a/src/core/execution/DefensePostExecution.ts
+++ b/src/core/execution/DefensePostExecution.ts
@@ -118,7 +118,7 @@ export class DefensePostExecution implements Execution {
       this.target = null;
       return;
     } else {
-      //this.shoot();
+      this.shoot();
       return;
     }
   }
diff --git a/src/core/execution/WarshipExecution.ts b/src/core/execution/WarshipExecution.ts
index 6cfecc63e..db467d55d 100644
--- a/src/core/execution/WarshipExecution.ts
+++ b/src/core/execution/WarshipExecution.ts
@@ -145,6 +145,7 @@ export class WarshipExecution implements Execution {
           (unit.type() !== UnitType.TradeShip ||
             (hasPort &&
               unit.dstPort()?.owner() !== this.warship.owner() &&
+              !unit.dstPort()?.owner().isFriendly(this.warship.owner()) &&
               unit.isSafeFromPirates() !== true)),
       );