[stools][fix] Various fixes