! Minor fixes related to alerts

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1975 from Oldiesmann/release-2.1

! Minor fixes related to alerts