Fix compilation after last merge