Tweaks for #456