More autojoin wording tweaks