Corrections and improvements to handling sleep / wake-up of evidence sources