Fixed some issues with Chinese