Try to fix two pathfinder bugs