Fix types and wording.