Another batch of fixes and adjustments.