#143 Minor heuristic analysis fixes found while experimenting with Skirmish