Build fix after last changes.