Simple compilation fix, probably broken by recent big changes. Needs review