Two tweaks for #80