Minor tweaks: