More tweaks for #623