CGE2: Further fixes to FXP operators to fix pathfinding