diff --git a/src/core/game/RailNetworkImpl.ts b/src/core/game/RailNetworkImpl.ts
index 711221120..d3aef952b 100644
--- a/src/core/game/RailNetworkImpl.ts
+++ b/src/core/game/RailNetworkImpl.ts
@@ -23,7 +23,7 @@ export interface StationManager {
 export class StationManagerImpl implements StationManager {
   private stations: Set<TrainStation> = new Set();
   private stationsById: (TrainStation | undefined)[] = [];
-  private nextId = 0;
+  private nextId = 1; // Start from 1; 0 is reserved as invalid/sentinel
 
   addStation(station: TrainStation) {
     station.id = this.nextId++;
diff --git a/src/core/pathfinding/PathFinder.Station.ts b/src/core/pathfinding/PathFinder.Station.ts
index 8510fb048..1efa20be6 100644
--- a/src/core/pathfinding/PathFinder.Station.ts
+++ b/src/core/pathfinding/PathFinder.Station.ts
@@ -42,7 +42,7 @@ class StationGraphAdapter implements AStarAdapter {
   }
 
   maxNeighbors(): number {
-    return 8;
+    return 32;
   }
 
   maxPriority(): number {