Fix up joining with new header/footer, too