Fixed header parsing some more