Fix compilation after last merge from upstream/master