Fixed some headers