Fix new compiler