More tweaks for #14