Fix astar fallbacks