fixes for pathfinder