diff --git a/game/theater/conflicttheater.py b/game/theater/conflicttheater.py
index a7ce062f..2f1414f0 100644
--- a/game/theater/conflicttheater.py
+++ b/game/theater/conflicttheater.py
@@ -500,13 +500,13 @@ class ConflictTheater:
                         distances[cp.id] = dist
                     if dist < closest_distance:
                         distances[cp.id] = dist
-            closest_cp_id = min(distances, key=distances.get)
+            closest_cp_id = min(distances, key=distances.get)  # type: ignore
 
             all_cp_min_distances[(control_point.id, closest_cp_id)] = distances[closest_cp_id]
         closest_opposing_cps = [
             self.find_control_point_by_id(i)
             for i
-            in min(all_cp_min_distances, key=all_cp_min_distances.get)
+            in min(all_cp_min_distances, key=all_cp_min_distances.get)  # type: ignore
           ]  # type: List[ControlPoint]
         assert len(closest_opposing_cps) == 2
         if closest_opposing_cps[0].captured:
diff --git a/gen/armor.py b/gen/armor.py
index 39c03c61..81931496 100644
--- a/gen/armor.py
+++ b/gen/armor.py
@@ -505,7 +505,7 @@ class GroundConflictGenerator:
         @param enemy_groups Potential enemy groups
         @param n number of nearby groups to take
         """
-        targets = []  # type: Optional[List[VehicleGroup]]
+        targets = []  # type: List[Optional[VehicleGroup]]
         sorted_list = sorted(
             enemy_groups,
             key=lambda group: player_group.points[0].position.distance_to_point(group[0].points[0].position)
@@ -520,7 +520,7 @@ class GroundConflictGenerator:
 
     @staticmethod
     def find_nearest_enemy_group(
-        player_group: CombatGroup,
+        player_group: VehicleGroup,
         enemy_groups: List[Tuple[VehicleGroup, CombatGroup]]
     ) -> Optional[VehicleGroup]:
         """
diff --git a/gen/conflictgen.py b/gen/conflictgen.py
index 61e3e1a2..65ea4058 100644
--- a/gen/conflictgen.py
+++ b/gen/conflictgen.py
@@ -1,6 +1,6 @@
 import logging
 import random
-from typing import Tuple
+from typing import Tuple, Optional
 
 from dcs.country import Country
 from dcs.mapping import Point
@@ -22,8 +22,8 @@ class Conflict:
                  attackers_country: Country,
                  defenders_country: Country,
                  position: Point,
-                 heading: int = None,
-                 size: int = None
+                 heading: Optional[int] = None,
+                 size: Optional[int] = None
                  ):
 
         self.attackers_side = attackers_side