Minor modifications of link tool.