Some localizations fixes