Fix a couple bugs with calendar alerts

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

Fix a couple bugs with calendar alerts