Upstream: Minor text changes