More tweaks for #259