more fixes for header versions