Additional header block and http layer fixups