Fix compilation after r617