fix some more header problems