Tweaks for #36