MADS: Fixes for the pathfinder