A few more tweaks for #98