Header checking improvments