Improve the multibyte string migration