Pathfinder Bug Fixes