Minor tweaks ...