Fixed more headers