Minor additional tweaks.