Final minor tweaks.