Bug fixes for attachment alerts
Merge branch 'attach-alert-bugs'