Header checking improvments
0106.13