Minor tweaks to match updated presenation.