Improve handling of unconnecting headers