Minor fixes in notification plugin