More char-width fixes