Tweaks for #1296