Fix header types