Don't mark node suspected at initialization and other cleanups