Disconnect discarded notifiers
Fix poll timing