Local Notifications improvements