Fix spelling and import errors.