Fixed headers, dup vars, etc.