Update for recent changes to engine.