Fix some headers