Several minor adjustments.