Make fixes to notification poller