Final small adjustments for this version.