Fixes to deal with non-standard headers (in DXA) [Paul Bromiley]