Various minor adjustments.