Fixes for DF header ID