Fix more headers