Minor tweaks missed from previous commit