A few more fixes to AStar