Update notification handling

Fixes issues with subsequent alarms