Some fixes in translation