header fixups and paranoid warning flags set