Fixed issues with header