Slight tweaks for #358