Minor tweaks to prior commit