Fixed all known Tool Repair bugs