AStar fixes