Resolve some inconsistencies and minor errors.