More tunnel cleanup and sanity checks