Minor fix to tools