More header/footer fixes