Fix header parsing
Fix key names