Header and platform fix