Fix wake notification and stopping events