Fix compilation error, part 1