Minor fixes for astar