[TASK] Fix copy/paste/localise issues