more fixes for header changes.