A few more tweaks for #89