Fix client buffer
Fix typo error
Name should not split to the next line