Update for new compiler