Minor tweaks to last commit