More work towards getting tool working again.