Tweaks for #4239