Tweaks for #1334