Added some fixes in translation