Add few header fix