Fixes extension headers
