Minor tweaks (again)