Tweaks for #1514