Tweaks for #2047