Fixing issues in header.