Bug fixes by Nuno, localization