Fixes from bugherd

Tweaks based on bugherd feedback