Minor tweaks from Preston feedback