Alignment of headers with native client