Minor tweaks, again