Minor tool rebuild change