Many fixes in translation