Annotate headers correctly