Header - fix few thing less frezze