Minor tweaks for #2