Fixes for header.