Minor tweaks following last commit