Base Local Planner fixes