Fixes in pathfinder