Improvements to handling evidence sources start / stop