Make header field names clearer
Get rid of some warnings