Fixed minor Bugs in AutoTool and SelectBestToolForBlock