Moved location of headerSize in base header