Fixes extension headers