Minor tweaks in places