Importing fixes to wording from #538