Small fixes for header