Translations and behaviour fixes