Fix texts and #17930