fixes for the simple tunnel case