Merge "Fix small mistakes in dumped string" into main