Doc change + other adjustments.