Minor tweaks from feedback