Minor tweaks & fixes