Minor tweaks for #69