Feature/fixes for translations