Cleanup and improve notification reliability