Tweaks to make orig person workflow er work