Minor tweaks to new code