Fixes on header