Minor tweaks again