two more header order changes