Tweaks for #1213