Further correct type errors.