Some more localizations and get rid of duplicate id