Correct headers, cues, etc