Minor fixes on header