Fixes for header