Fix for A*; other minor changes