Tweaks for #1454