More tunnel updates