Fix encoded header types