Tweaks for #11 and #12