[ISTL] Fix a number of headercheck problems