Fixed a few translation releated bugs