Quick header fixes