Fix compilation problems caused by [e3a596417c] and [df2fdd325b]