more fixes for headers...