Bug fixes for header