Minor header and import fixes