NotificationsLab - minor improvements