CLC-1648 Followups and tweaks

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1648

Tweaks responding to Scot requests and YH PR feedback.