Fix some incorrect translate. Improve