CLC-1075 Assorted notification fixes

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1075

Various small fixes.